Trying to debug alarm
Merge remote-tracking branch 'origin/dev' into alarm-dev
Going from the still timer rather than the active timer