Merge "Add option to disable alarms"