Issue #26547: Merge from 3.5