Merge "Adds more verification in list alarms"