Merge latest from snmp-alarms