Issue #29407: Merge from 3.5