Index: firmware/App/HDCommon.h
===================================================================
diff -u -rd4e699aba5ad4e197ef97cba4bc6ebebf210d1b3 -r0061c3200d629ab59c465acef7569d691e6ded37
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision d4e699aba5ad4e197ef97cba4bc6ebebf210d1b3)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 0061c3200d629ab59c465acef7569d691e6ded37)
@@ -72,6 +72,8 @@
 //    #define DISABLE_BATT_COMM               1           // Disable battery communication.
     #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
     #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
+    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
+    #define SKIP_EMPTY_RES_CHECK            1           // Skip reservoir empty check
 
     #include <stdio.h>
     #include <strings.h>
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd4e699aba5ad4e197ef97cba4bc6ebebf210d1b3 -r0061c3200d629ab59c465acef7569d691e6ded37
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d4e699aba5ad4e197ef97cba4bc6ebebf210d1b3)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0061c3200d629ab59c465acef7569d691e6ded37)
@@ -1261,6 +1261,18 @@
             handleTreatmentEndCmd( message );
             break;
 
+        case MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM:
+            handlePatientDisconnectionConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM:
+            handleDisposableRemovalConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST:
+            handleUITreatmentLogDataRequest( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             handleDGCmdResp( message );
             break;