Merged styling updates for #11670 from 3.2.