Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r9ce06772b2f651c57144327e6cbf886e2bc22dee -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9ce06772b2f651c57144327e6cbf886e2bc22dee)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d)
@@ -37,11 +37,11 @@
 // ********** private definitions **********
 
 #define NUM_OF_CAN_OUT_BUFFERS          5                                   ///< Number of CAN buffers for transmit
-#define NUM_OF_CAN_IN_BUFFERS           6                                   ///< Number of CAN buffers for receiving
+#define NUM_OF_CAN_IN_BUFFERS           7                                  ///< Number of CAN buffers for receiving
 #ifndef DEBUG_ENABLED
-    #define NUM_OF_MSG_IN_BUFFERS       6                                   ///< Number of Msg buffers for receiving
+    #define NUM_OF_MSG_IN_BUFFERS       7                                   ///< Number of Msg buffers for receiving
 #else
-    #define NUM_OF_MSG_IN_BUFFERS       7
+    #define NUM_OF_MSG_IN_BUFFERS       8
     #define SCI1_RECEIVE_DMA_REQUEST    30
     #define SCI1_TRANSMIT_DMA_REQUEST   31
 #endif
@@ -81,9 +81,9 @@
 {
     COMM_BUFFER_OUT_CAN_DG_ALARM,
     COMM_BUFFER_OUT_CAN_DG_2_HD,
+    COMM_BUFFER_OUT_CAN_DG_2_UI,
     COMM_BUFFER_OUT_CAN_DG_BROADCAST,
-    COMM_BUFFER_OUT_CAN_PC,
-    COMM_BUFFER_OUT_CAN_DG_2_UI
+    COMM_BUFFER_OUT_CAN_PC
 };
 
 /// Array of in-coming CAN buffers.
@@ -93,6 +93,7 @@
     COMM_BUFFER_IN_CAN_UI_ALARM,
     COMM_BUFFER_IN_CAN_HD_2_DG,
     COMM_BUFFER_IN_CAN_HD_BROADCAST,
+    COMM_BUFFER_IN_CAN_UI_2_DG,
     COMM_BUFFER_IN_CAN_UI_BROADCAST,
     COMM_BUFFER_IN_CAN_PC,
 #ifdef DEBUG_ENABLED
@@ -999,6 +1000,10 @@
             handlePowerOffWarning( message );
             break;
 
+        case MSG_ID_ALARM_CLEARED:
+            handleAlarmClear( message );
+            break;
+
         case MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS:
             handleSetDialysateTemperatureCmd( message );
             break;
@@ -1209,6 +1214,46 @@
                 handleTestUVReactorsHealthOverride( message );
                 break;
 
+            case MSG_ID_DG_SET_CALIBRATION_RECORD:
+                handleSetDGCalibrationRecord( message );
+                break;
+
+            case MSG_ID_DG_GET_CALIBRATION_RECORD:
+                handleGetDGCalibrationRecord( message );
+                break;
+
+            case MSG_ID_DG_SET_SYSTEM_RECORD:
+                handleSetDGSystemRecord( message );
+                break;
+
+            case MSG_ID_DG_GET_SYSTEM_RECORD:
+                handleGetDGSystemRecord( message );
+                break;
+
+            case MSG_ID_DG_GET_SERVICE_RECORD:
+                handleGetDGServiceRecord( message );
+                break;
+
+            case MSG_ID_DG_SET_SERVICE_RECORD:
+                handleSetDGServiceRecord( message );
+                break;
+
+            case MSG_ID_DG_GET_SCHEDULED_RUNS_RECORD:
+                handleGetDGScheduledRunsRecord( message );
+                break;
+
+            case MSG_ID_DG_SET_SCHEDULED_RUNS_RECORD:
+                handleSetDGScheduledRunsRecord( message );
+                break;
+
+            case MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
+                handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE:
+                handleSetFluidLeakStateDetectorOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;