Issue #24357: merge from 3.5