Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r5109bb981cab2025fcb9de33e303d046085efa18 -rac305d5eedc7fb0e85adef5cd4aa34e58e94e3b8
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5109bb981cab2025fcb9de33e303d046085efa18)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ac305d5eedc7fb0e85adef5cd4aa34e58e94e3b8)
@@ -8,7 +8,7 @@
 * @file    SystemComm.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      15-May-2023
+* @date    (last)      20-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -909,8 +909,8 @@
             handleDGPOSTResultRequest( message );
             break;
 
-        case MSG_ID_HD_DG_SERVICE_RECORD_REQUEST:
-            handleDGServiceScheduleRequest( message );
+        case MSG_ID_UI_SERVICE_INFO_REQUEST:
+            handleDGServiceScheduleRequestToUI( message );
             break;
 
         case MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST:
@@ -937,14 +937,26 @@
             handleResendAllAlarmsCommand( message );
             break;
 
+        case MSG_ID_UI_SET_DG_RO_MODE:
+            handleSetROOnlyMode( message );
+            break;
+
         case MSG_ID_HD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DG:
             handleReceiveChemFlushSampleResultsFromHD( message );
             break;
 
-        case MSG_ID_UI_SET_DG_RO_MODE:
-            handleSetROOnlyMode( message );
+        case MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST:
+            handleStartStopDGROPermeateSample( message );
             break;
 
+        case MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST_TO_DG:
+            handleReceiveROPermeatSampleDispenseRequest( message );
+            break;
+
+        case MSG_ID_HD_REQUEST_SERVICE_RECORD_FROM_HD:
+            handleSendDGServiceRecordToHD( message );
+            break;
+
         // NOTE: This case must be last
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1212,13 +1224,15 @@
                 handleTestUsedBicarbVolumeMLOverrideRequest( message );
                 break;
 
+#ifndef _RELEASE_
             case MSG_ID_DG_GET_SW_CONFIG_RECORD:
                 handleGetDGSoftwareConfigRecord( message );
                 break;
 
             case MSG_ID_DG_SET_SW_CONFIG_RECORD:
                 handleSetDGSoftwareConfigRecord( message );
                 break;
+#endif
 
             case MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE:
                 handleSetFansDutyCycleOverrideRequest( message );
@@ -1338,6 +1352,10 @@
                 handleTestDGSetConductivitySensorCalTable( message );
                 break;
 
+            case MSG_ID_DG_SIGNAL_RECOVER_FROM_FAULT_MODE:
+                handleTestDGSetRecoverFromFaultModeSignal( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;