merge 3.5 (#25530)