Issue #21569: merge from 3.4