merge 3.2 (#14717)