Merge pull request #21931 from tiborvass/cherry-picks-1.11.0-rc5

Cherry picks 1.11.0 rc5