Merge pull request #14261 from caseydavenport/casey-backport-14095-v3.33