Issue #24324: merge from 3.5