#18151 Merge from 3.3