#17460 - merge from 3.2