Merge pull request #20195 from tiborvass/1.10.1-cherrypicks

1.10.1 cherrypicks