merge 3.5 (#28454)