merge 3.3 (#20796)