Merge #12249 fix from 3.2