Issue #26302: merge from 3.5