Merge branch 'hotfix/fix_alarm_creation'
Merge branch 'develop'

* develop:
  add additional variables
Merge branch 'develop'
Merge branch 'develop'
Delete LICENSE