Merge typo fixes from 3.6