merge 3.3 (#18565)