Fixed a couple of migration dependency issues
Merge branch 'master' into develop