Merge branch 'hotfix/fix_term_firm_model'
fix
Merge branch 'hotfix/fixed_tasks_list' into develop