Related data constraint fixes
Merge pull request #95 from lemonde/lmd-constraints

Related data constraint fixes