Issue #29314: Merge with 3.5