Merge branch 'release/check_term_alarm'
fix
Merge branch 'hotfix/fix_bags_in_term_alarms' into develop