Issue #29013: Merge from 3.5