Issue #18080: merge from 3.3