Merge #10553 followup from 3.2