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