Merge pull request #21918 from braders/feature/spelling-fixes