Issue #19450: merge from 3.4