Merge pull request #12414 from nelljerram/auto-pick-of-#12328-#12394-#12398-origin-release-v3.32