Issue #21704: Merge.