merge 3.4 (#11709)