Merge pull request #11329 from lucastigera/auto-pick-of-#10100-upstream-release-v3.31