merge 3.2 (#13199)