Fix delete()
Merge branch '2.1' into feature_refactored_relations
Another example
Merge branch '2.1' into feature_refactored_relations