Merge pull request #11613 from tomastigera/auto-pick-of-#11252-upstream-release-v3.31