Merge pull request #22242 from mlaventure/1.11.1-cherry-pick

1.11.1 cherry pick