#17307 - merge from 3.2