merge 3.4 (#22735)