Fix migrations
Merge branch 'hotfix/fix_migration'