Merge branch 'develop' into release-1.0
Merge branch 'release-1.0'
Prevent issue where dublicate pk on insert.
Merge branch 'hotfix-1.0.1' into develop