Merge pull request #11377 from nelljerram/auto-pick-of-#11365-origin-release-v3.31