Merge branch 'hotfix/fix_variables' into develop
Merge branch 'hotfix/fix_alarm_creation' into develop
add additional variables
Merge branch 'develop'

* develop:
  add additional variables