Issue #24079: merge from 3.5