Merge master into ontology

Reverted the reverts and then pulled from the master.
Merges the new model registry.
Includes tweaks to metadata metadata