fix migration
Merge branch 'hotfix/2.1.1'