Issue #26930: merge from 3.5