Merge "Implement merging all ncmp datastore endpoints into one"