Merge branch 'develop' into alarm-fixes