merge 3.3 (#21082)