Merged #11670 from 3.2