Issue #28676: merge from 3.5