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