Merge branch 'hotfix/account_3'
Fix
Merge branch 'hotfix/refactor_firm_account' into develop