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