Fix relation sets
Merge branch '1.1'