Issue #29012: Merge from 3.5