Re #1396 - New EDM schema, with modified cardinality on ore:ProxyIn and ore:ProxyFor
Merge origin/master