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