Issue 18833: more merging