merge 3.4 (#24655)