fix
Merge branch 'hotfix/fix_alarm_email_template'