Merge master into ontology

Reverted the reverts and then pulled from the master.
Includes new model registry.