change domain model to have more relationship types, therefore avoiding the need for some label checks
Merge branch '2.0-maint' into 2.1-maint