merge 3.2 (#19435)