Issue #27125: Merge typo fixes from 3.5

Also merge changes from Issue #27117; no actual code changes to 3.6.