Fix
Merge branch 'hotfix/refactor_firm_account'