Bug fixes
Bug fixes
Merge branch 'hotfix/migrations'