Merge #11401 fix from 3.1.