Merge branch 'hotfix/fix_bags_in_term_alarms'
fix
Merge branch 'hotfix/fix_bags_in_term_alarms_stage2' into develop