Issue #18604: merge from 3.4