Merge "Fixed alarm related issues"