Alarm A and B extended merge

Alarm A and B merge with master