Issue #18164: merge from 3.3