merge 3.3 (#16906)