Merge pull request #15371 from mehrdada/v1.11.x

Backport 15362 to 1.11.x