Merge branch 'hotfix/fix_variables'
make alarm creation a local command
Merge branch 'hotfix/fix_alarm_creation' into develop