Merging from geocat 2 not yet complete