merge 3.3 (#17328)