Merge #13424 followup from 3.3