Issue #13540: Merge commits