Merge branch 'hotfix/2.1.1'
fix migration
Merge branch 'hotfix/2.1.2' into develop