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