Issue #19373: merge from 3.3