Merge branch 'hotfix/table-mapper-fix'
- Fixed leftover from old foreign keys leftover
Merge branch 'hotfix/update-foreign-keys-fix' into develop