Issue #10997: merge from 3.2