Fixed the model loading that was incorrectly discarding some constratins
that references relationship created columns (special objects).
Merge branch 'develop'