Issue #24330: merge from 3.4