Merge #11243 fix from 3.2.