Merge branch 'fix-migration' into 'develop'