Merge pull request #13575 from coutinhop/auto-pick-of-#13457-#13461-#13471-upstream-release-v3.33