merge 3.3 (#23130)