merge 3.2 (#20695)