merge 3.4 (#21121)