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