Issue #17097: Merge.