Issue #27125: Merge typo fixes from 3.5