merge 3.2 (#21766)