Merge #18952 fix from 3.3