merge 3.2 (#22931)