Issue #15392: merge from 3.3