Merge pull request #10661 from tomastigera/auto-pick-of-#10660-upstream-release-v3.30