Merge master changes for ontology inspector.