Issue #27626: Merge spelling fixes from 3.5