merge 3.4 (#23873)