Merge ontology master

Merge ontology master