Issue #27745: Merge typo fixes from 3.5