Merge branch 'hotfix/fix_bags_in_report_task'
fix: spot code generator
Merge branch 'hotfix/fix_spot_code_generation' into develop