Make relationship rules work in ontology
merge from upstream