merge 3.4 (#9179)