Make relationship rules work in ontology
Merge remote-tracking branch 'upstream/develop' into develop
new changes