Issue #29069: Merge from 3.6