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