Fix migrations
Merge branch 'master' into fix-migrations