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

Related data constraint fixes