Merge fixes for #12256 and typos from 3.2