#11298: merge from 3.2.