Issue #26465: merge from 3.5