Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680 -r587d23c7ba96d1938658908ceb67850e4e4e08c8
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 587d23c7ba96d1938658908ceb67850e4e4e08c8)
@@ -371,12 +371,11 @@
         measuredROFlowRateLPM.data              = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) -
                                                          ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER );
 
-       // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that
-       // the flow is 0.
-       if ( FLOW_SENSOR_ZERO_READING == roFlowReading )
-       {
-          measuredROFlowRateLPM.data = 0.0;
-       }
+        // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that the flow is 0.
+        if ( FLOW_SENSOR_ZERO_READING == roFlowReading )
+        {
+            measuredROFlowRateLPM.data = 0.0;
+        }
 
         measuredFlowReadingsSum = 0;
         flowFilterCounter       = 0;
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680 -r587d23c7ba96d1938658908ceb67850e4e4e08c8
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 587d23c7ba96d1938658908ceb67850e4e4e08c8)
@@ -131,7 +131,6 @@
 void execOperationModes( void )
 {
     DG_OP_MODE_T newMode;
-    U32 priorSubMode = currentSubMode;
 
     priorSubMode = currentSubMode;
 
@@ -150,7 +149,6 @@
     if ( currentMode != newMode )
     {
         // handle transition to new mode
-        priorSubMode = 0;
         lastMode = currentMode;
         transitionToNewOperationMode( newMode );
         currentMode = newMode;
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680 -r587d23c7ba96d1938658908ceb67850e4e4e08c8
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 587d23c7ba96d1938658908ceb67850e4e4e08c8)
@@ -1122,11 +1122,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:
@@ -1137,10 +1137,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;
@@ -1153,6 +1149,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;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680 -r587d23c7ba96d1938658908ceb67850e4e4e08c8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 587d23c7ba96d1938658908ceb67850e4e4e08c8)
@@ -23,7 +23,6 @@
 #include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
-#include "Fans.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFill.h"
@@ -365,7 +364,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -3050,37 +3048,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
@@ -3254,10 +3221,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
  *************************************************************************/
@@ -3280,7 +3278,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680 -r587d23c7ba96d1938658908ceb67850e4e4e08c8
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 587d23c7ba96d1938658908ceb67850e4e4e08c8)
@@ -359,6 +359,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 );
 
@@ -380,6 +386,12 @@
 // MSG_ID_DG_HD_COMMUNICATION_STATUS
 void handleTestHDCommunicationStatusOverrideRequest(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 );