Merge branch 'hotfix/fix_report_stack_bags'
fix
Merge branch 'hotfix/soc_checks_fix' into develop