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