merge 3.3 (#24407)