Merge pull request #8768 from caseydavenport/auto-pick-of-#8766-origin-release-v3.28