merge 3.3 (#18574)