Issue #16256: merge from 3.3