Merge fix from snmp-alarms