merge 3.3 (#22643)