merge 3.2 (#9284)