Issue #29441: Merge from 3.5