Merge #19092 from 3.3