Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r59357d3831aa60f17ccdfbe0eef1a005935b9a58 -r860e1cef62ff8678b6eba8bb58bbb737bba48bba
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 59357d3831aa60f17ccdfbe0eef1a005935b9a58)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 860e1cef62ff8678b6eba8bb58bbb737bba48bba)
@@ -317,11 +317,9 @@
 /*********************************************************************//**
  * @brief
  * The checkInletWaterConductivity function checks inlet water conductivity value
- * and triggers an alarm when conductivity value is not within the specified
- * values.
+ * and triggers an alarm when conductivity value is out of allowed range.
  * @details Inputs: CPi sensor conductivity
- * @details Outputs: Trigger warning alarm if conductivity is in the warning
- * range. Trigger alarm if conductivity is below minimum conductivity.
+ * @details Outputs: Trigger alarms when conductivity is out of allowed range
  * @return none
  *************************************************************************/
 void checkInletWaterConductivity( void )
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r59357d3831aa60f17ccdfbe0eef1a005935b9a58 -r860e1cef62ff8678b6eba8bb58bbb737bba48bba
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 59357d3831aa60f17ccdfbe0eef1a005935b9a58)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 860e1cef62ff8678b6eba8bb58bbb737bba48bba)
@@ -188,6 +188,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -198,6 +199,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -243,6 +245,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r59357d3831aa60f17ccdfbe0eef1a005935b9a58 -r860e1cef62ff8678b6eba8bb58bbb737bba48bba
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 59357d3831aa60f17ccdfbe0eef1a005935b9a58)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 860e1cef62ff8678b6eba8bb58bbb737bba48bba)
@@ -1173,11 +1173,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:
@@ -1188,10 +1188,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;
@@ -1204,6 +1200,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;
@@ -1250,14 +1250,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 -r59357d3831aa60f17ccdfbe0eef1a005935b9a58 -r860e1cef62ff8678b6eba8bb58bbb737bba48bba
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 59357d3831aa60f17ccdfbe0eef1a005935b9a58)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 860e1cef62ff8678b6eba8bb58bbb737bba48bba)
@@ -406,7 +406,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -3483,37 +3482,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
@@ -3652,10 +3620,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
  *************************************************************************/
@@ -3678,7 +3677,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r59357d3831aa60f17ccdfbe0eef1a005935b9a58 -r860e1cef62ff8678b6eba8bb58bbb737bba48bba
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 59357d3831aa60f17ccdfbe0eef1a005935b9a58)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 860e1cef62ff8678b6eba8bb58bbb737bba48bba)
@@ -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 );
 
@@ -384,6 +390,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 );
 
@@ -404,21 +416,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 );