Hotfix - Check for unique keys when migrating.
Merge branch 'develop'