Index: AlarmDefs.h
===================================================================
diff -u -rd63c2523650b841c64256549e1ae9d1cf986175d -rb7fc5639e0ef911036ed762587d558ee1a599f21
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision d63c2523650b841c64256549e1ae9d1cf986175d)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision b7fc5639e0ef911036ed762587d558ee1a599f21)
@@ -176,6 +176,9 @@
     ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE = 138,             ///< HD pre-treatment mode wet self-tests failure
     ALARM_ID_DG_FLOW_METER_CHECK_FAILURE = 139,                     ///< DG flow meter check failure alarm
     ALARM_ID_DG_RO_PUMP_TOO_MANY_RAMP_UP_RETRY = 140,               ///< DG RO pump ramp up exceed maximum allowed number of retries
+    ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID = 141,             ///< DG/HD NV data management overall group record CRC invalid
+    ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID = 142,        ///< DG/HD NV data management individual record CRC invalid
+    ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID = 143,       ///< DG/HD NV data management individual record time invalid
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
Index: MsgDefs.h
===================================================================
diff -u -r8b3423d02f58a44bca8aa90dfa0ad42019727416 -rb7fc5639e0ef911036ed762587d558ee1a599f21
--- MsgDefs.h	(.../MsgDefs.h)	(revision 8b3423d02f58a44bca8aa90dfa0ad42019727416)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision b7fc5639e0ef911036ed762587d558ee1a599f21)
@@ -224,7 +224,7 @@
     MSG_ID_DG_ACCEL_OVERRIDE = 0xA017,                                  ///< DG accelerometer sensor override request
     MSG_ID_DG_ACCEL_MAX_OVERRIDE = 0xA018,                              ///< DG accelerometer sensor max. override request
     MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0xA019,                    ///< DG accelerometer data broadcast interval override request
-    MSG_ID_DG_ACCEL_SET_CALIBRATION = 0xA01A,                           ///< DG accelerometer set calibration factors request
+    MSG_ID___AVAILABLE_11 = 0xA01A,                                     ///< This msg ID is available for use
     MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA01C,             ///< Drain pump set delta pressure override
     MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS = 0xA01D,           ///< Heat disinfection recirculation path duration in minutes
     MSG_ID_HEAT_DISINFECT_R1_TO_R2_DURATION_MINS = 0xA01E,              ///< Heat disinfection reservoir 1 to reservoir 2 duration in minutes