Issue #18270: merge from 3.3