merge 3.4 (#25145)