Issue #28820: Merge typo fixes from 3.6