merge 3.4 (#23844)