merge 3.2 (#20246)