merge 3.3 (#24096)