Merge pull request #30116 from vieux/cherry-pick-1.13.0-rc7

cherry pick 1.13.0-rc7