Merge #20317 from 3.3