Merge branch 'hotfix/refactor_firm_account'
Fix migrations
Merge branch 'hotfix/fix_migration' into develop