merge 3.4 (#25319)