merge 3.2 (#16369)