merge 3.2 (#23130)