Sets up callback, doesn't get called though
Merge remote-tracking branch 'origin/dev' into alarm-dev