Issue #26406: merge from 3.5