merge 3.3 (#19117)