Issue #26505: merge from 3.5