CXX-237 more merging