Issue #24432: merge from 3.5