merge 3.5 (#29057)