merge 3.4 (#26171)