merge 3.4 (#22643)