Fix migrations
Merge branch 'dev'