Issue #18517: merge from 3.3