Build fixes
Build fixes
Migration improvements
Merge branch 'dev'