merge 3.2 (#12878)