Index: dialin/common/alarm_defs.py
===================================================================
diff -u -r5cfee988b0705cf5516affc56088039e19f5d090 -r918df13b9a56e2be957064395a6c741cbcbf5bbe
--- dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision 5cfee988b0705cf5516affc56088039e19f5d090)
+++ dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision 918df13b9a56e2be957064395a6c741cbcbf5bbe)
@@ -343,3 +343,4 @@
     ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT = 320
     ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY = 321
     ALARM_ID_HD_UI_POST_FAILURE_INVALID_YEAR = 322
+    ALARM_ID_HD_UI_POST_FAILURE_SETTINGS_BAD = 323
Index: dialin/common/msg_defs.py
===================================================================
diff -u -r5cfee988b0705cf5516affc56088039e19f5d090 -r918df13b9a56e2be957064395a6c741cbcbf5bbe
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 5cfee988b0705cf5516affc56088039e19f5d090)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 918df13b9a56e2be957064395a6c741cbcbf5bbe)
@@ -98,7 +98,7 @@
     MsgIds.MSG_ID_HD_FANS_DATA.value,
     MsgIds.MSG_ID_DG_ALARM_INFO_DATA.value,
     MsgIds.MSG_ID_HD_RESERVOIRS_DATA.value,
-    MsgIds.MSG_ID_DG_CPLD_STATUS.value,
+    MsgIds.MSG_ID_DG_CPLD_STATUS_DATA.value,
     MsgIds.MSG_ID_DG_DIALIN_CHECK_IN.value,
     MsgIds.MSG_ID_HD_DIALIN_CHECK_IN.value
 ]
Index: dialin/common/msg_ids.py
===================================================================
diff -u -r5cfee988b0705cf5516affc56088039e19f5d090 -r918df13b9a56e2be957064395a6c741cbcbf5bbe
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 5cfee988b0705cf5516affc56088039e19f5d090)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 918df13b9a56e2be957064395a6c741cbcbf5bbe)
@@ -145,7 +145,7 @@
     MSG_ID_DG_FLUSH_DATA = 0x7A
     MSG_ID_HD_VOLTAGES_DATA = 0x7B
     MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0x7C
-    MSG_ID_HD_ALARM_INFORMATION = 0x7D
+    MSG_ID_HD_ALARM_INFORMATION_DATA = 0x7D
     MSG_ID_HD_POST_TX_NEXT_CMD_RESPONSE = 0x7E
     MSG_ID_UI_DISINFECT_REQUEST = 0x7F
     MSG_ID_HD_DISINFECT_RESPONSE = 0x80
@@ -381,6 +381,7 @@
     MSG_ID_HD_SIGNAL_RECOVER_FROM_FAULT_MODE = 0x8098
     MSG_ID_HD_RAM_STATUS_OVERRIDE = 0x8099
     MSG_ID_HD_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE = 0x809A
+    MSG_ID_HD_CAN_RECEIVE_ACK_MESSAGE_OVERRIDE = 0x809B
 
     MSG_ID_DG_TESTER_LOGIN_REQUEST = 0xA000
     MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001
@@ -493,6 +494,7 @@
     MSG_ID_DG_DRAIN_MODE_BROADCAST_INTERVAL_OVERRIDE = 0xA070
     MSG_ID_DG_DIALIN_RO_ONLY_MODE_STATUS_REQUEST = 0xA071
     MSG_ID_DG_RAM_STATUS_OVERRIDE = 0xA072
+    MSG_ID_DG_CAN_RECEIVE_ACK_MESSAGE_OVERRIDE = 0xA073
     MSG_ID_DG_RESERVOIR_BROADCAST_INTERVAL_OVERRIDE = 0xA074
 
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1