merge 3.4 (#25569)