Issue #7367: merge from 3.2