Issue #26267: Merge from 3.5