merge 3.5 (#24963)