Merge pull request #12967 from lucastigera/auto-pick-of-#12961-upstream-release-v3.32