Merge #12295 fix from 3.2