Alarms/PDLogs merge update