Closes #22072: Merge typo fixes from 3.4