Issue #28835: merge from 3.6