Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rc14a0220256e92a6339a444a3e1bc85e159ccce3 -r5d13922ee2e8c851bc5db67ef4d0120b47de6f07
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c14a0220256e92a6339a444a3e1bc85e159ccce3)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5d13922ee2e8c851bc5db67ef4d0120b47de6f07)
@@ -191,7 +191,12 @@
 void checkInFromDG( void )
 {
     dgIsCommunicating = TRUE;
-    timeOfLastDGCheckIn = getMSTimerCount();
+    timeOfLastDGCheckIn = getMSTimerCount();
+
+    if ( TRUE == isAlarmActive( ALARM_ID_DG_COMM_TIMEOUT ) )
+    {
+        clearAlarm( ALARM_ID_DG_COMM_TIMEOUT );
+    }
 }
 
 /*********************************************************************//**
@@ -208,6 +213,7 @@
     {   // Start DG check-in timer when UI first communicates
         timeOfLastDGCheckIn = getMSTimerCount();
     }
+
     uiIsCommunicating = TRUE;
     timeOfLastUICheckIn = getMSTimerCount();
     uiDidCommunicate = TRUE;
@@ -1189,10 +1195,6 @@
             handleInitiateTreatmentRequest( message );
             break;
 
-        case MSG_ID_UI_START_TREATMENT_REQUEST:
-            handleStartTreatmentRequest( message );
-            break;
-
         case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS:
             handleUIUserConfirmTreatmentParameters( message );
             break;
@@ -1209,6 +1211,38 @@
             handleUFVolumeSetRequest( message );
             break;
 
+        case MSG_ID_UI_SAMPLE_WATER_CMD:
+            handleSampleWaterCmd( message );
+            break;
+
+        case MSG_ID_UI_SAMPLE_WATER_RESULT:
+            handleSampleWaterResult( message );
+            break;
+
+        case MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM:
+            handleConsumableInstallConfirm( message );
+            break;
+
+        case MSG_ID_UI_INSTALLATION_CONFIRM:
+            handleInstallationConfirm( message );
+            break;
+
+        case MSG_ID_UI_START_PRIME_REQUEST:
+            handleStartPrimeCmd( message );
+            break;
+
+        case MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST:
+            handleContinueToTreatmentCmd( message );
+            break;
+
+        case MSG_ID_UI_PATIENT_CONNECTION_CONFIRM:
+            handlePatientConnectionConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_START_TREATMENT_REQUEST:
+            handleStartTreatmentRequest( message );
+            break;
+
         case MSG_ID_UI_RINSEBACK_CMD:
             handlRinsebackCmd( message );
             break;