Issue #28248: merge from 3.5