Fixed mapping problem where UK and FK share columns they are inserted

twice

added 3 commits

• d813afb7...1ff9d73c - 2 commits from branch master
• 5880d860 - Merge branch 'master' into dev

Compare with previous version

enabled an automatic merge when the pipeline for 5880d860 succeeds

mentioned in commit 57e5d4ec

merged