Merge branch 'alarm' into release