merge 3.4 (#22517)