Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rad272a524906daa67d4de0aa41ac401dd33afc8f -r1487a2af97827ecc76aa38193fcd8376cf72c373
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision ad272a524906daa67d4de0aa41ac401dd33afc8f)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 1487a2af97827ecc76aa38193fcd8376cf72c373)
@@ -596,7 +596,7 @@
 
     // Park concentrate pump too if requested
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK ) != SW_CONFIG_ENABLE_VALUE )
+    if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK ) )
     {
         if ( HW_CONFIG_BETA == getHardwareConfigStatus() )
         {
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -rad272a524906daa67d4de0aa41ac401dd33afc8f -r1487a2af97827ecc76aa38193fcd8376cf72c373
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision ad272a524906daa67d4de0aa41ac401dd33afc8f)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 1487a2af97827ecc76aa38193fcd8376cf72c373)
@@ -85,8 +85,8 @@
     SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX,
     SW_FAULT_ID_CONCENTRATE_PUMP_EXEC_INVALID_STATE,                    // 55
     SW_FAULT_ID_CONCENTRATE_PUMP_INVALID_PUMP_ID,
-    SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT,
     SW_FAULT_ID_SERVICE_MODE_INVALID_EXEC_STATE,
+    SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT,
     SW_FAULT_ID_UV_REACTORS_INVALID_EXEC_STATE,
     SW_FAULT_ID_UV_REACTORS_INVALID_SELF_TEST_STATE,                    // 60
     SW_FAULT_ID_THERMISTORS_INVALID_EXEC_STATE,
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rad272a524906daa67d4de0aa41ac401dd33afc8f -r1487a2af97827ecc76aa38193fcd8376cf72c373
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ad272a524906daa67d4de0aa41ac401dd33afc8f)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1487a2af97827ecc76aa38193fcd8376cf72c373)
@@ -1181,11 +1181,11 @@
                 break;
 
             case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
-                handleFilterFlushTimePeriodOverride( message );
+                handleFilterFlushTimePeriodOverride(message);
                 break;
 
-            case MSG_ID_DG_FANS_RPM_OVERRIDE:
-                handleFansRPMOverride( message );
+            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
+                handleTestBlockMessagesRequest( message );
                 break;
 
             case MSG_ID_DG_STOP_RTC_CLOCK:
@@ -1196,10 +1196,6 @@
                 handleSetDrainPumpMeasuredRPMOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
-                handleTestBlockMessagesRequest( message );
-                break;
-
             case MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD:
                 handleTestSuperClearAlarmsRequest( message );
                 break;
@@ -1212,6 +1208,10 @@
                 handleTestFansRPMAlarmStartTimeOffsetRequest( message );
                 break;
 
+            case MSG_ID_DG_FANS_RPM_OVERRIDE:
+                handleFansRPMOverride( message );
+                break;
+
             case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE:
                 handleTestUsedAcidVolumeMLOverrideRequest( message );
                 break;
@@ -1258,14 +1258,14 @@
                 handleTestTareReservoirRequest( message );
                 break;
 
-            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
-                handleTestDrainPumpMeasuredCurrentOverride( message );
-                break;
-
             case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
                 handleTestGenIdlePublishIntervalOverride( message );
                 break;
 
+            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
+                handleSetDrainPumpMeasuredRPMOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
                 handleTestDGDrainPumpDirectionOverrideRequest( message );
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8822f86705a24d1c7dd305b584a95ae3d3c406b8 -r1487a2af97827ecc76aa38193fcd8376cf72c373
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8822f86705a24d1c7dd305b584a95ae3d3c406b8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1487a2af97827ecc76aa38193fcd8376cf72c373)
@@ -407,7 +407,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -3566,37 +3565,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3735,10 +3703,41 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
- * request to set the fans RPM alarm start time offset.
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
  * @details Inputs: none
  * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3761,7 +3760,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rad272a524906daa67d4de0aa41ac401dd33afc8f -r1487a2af97827ecc76aa38193fcd8376cf72c373
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ad272a524906daa67d4de0aa41ac401dd33afc8f)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1487a2af97827ecc76aa38193fcd8376cf72c373)
@@ -167,6 +167,12 @@
 // MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST
 BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode );
 
+// MSG_ID_HD_OP_MODE
+BOOL handleSetHDOperationMode( MESSAGE_T *message );
+
+// MSG_ID_HD_REQUEST_DG_USAGE_INFO
+void handleHDRequestDGUsageInfo( MESSAGE_T * message );
+
 // MSG_ID_DG_SET_SERVICE_TIME
 void handleSetDGServiceTime( MESSAGE_T *message );
 
@@ -393,6 +399,12 @@
 // MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE
 void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE
+void handleTestAlarmInfoSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD
+void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET
 void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message );
 
@@ -413,21 +425,27 @@
 void handleSetDGSoftwareConfigRecord( MESSAGE_T *message );
 #endif
 
+// MSG_ID_HD_REQUEST_DG_ALARMS
+void handleResendAllAlarmsCommand( MESSAGE_T *message );
+
 // MSG_ID_DG_HD_COMMUNICATION_STATUS
 void handleTestHDCommunicationStatusOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP
 void handleSetPrimaryAndTrimmerHeatersTargetTemperature( MESSAGE_T *message );
 
+// MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE
+void handleTestUsedAcidVolumeMLOverrideRequest(MESSAGE_T *message);
+
+// MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE
+void handleTestUsedBicarbVolumeMLOverrideRequest(MESSAGE_T *message);
+
 // MSG_ID_DG_GET_USAGE_INFO_RECORD
 void handleGetDGUsageInfoRecord( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_USAGE_INFO_RECORD
 void handleSetDGUsageInfoRecord( MESSAGE_T *message );
 
-// MSG_ID_HD_REQUEST_DG_ALARMS
-void handleResendAllAlarmsCommand( MESSAGE_T *message );
-
 // MSG_ID_DG_SET_OP_MODE_REQUEST
 void handleTestSetOpModeRequest( MESSAGE_T *message );