Issue #29198: Merge from 3.5