Merge #11496 from 3.2.