Issue #29283: Merge from 3.6