add alarm manager
Merge remote-tracking branch 'origin/alarm' into merge_branch