Issue #15587: merge from 3.2