Merge #18396 from 3.3