Merge pull request #19095 from muxi/v1.21.x

Backport #19082