merge 3.4 (#24118)