Issue #24745: merge from 3.5