Merge pull request #8750 from tomastigera/auto-pick-of-#8742-upstream-release-v3.28