Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -re4657f6c590eed9c6af43a9739b87b81a34a8144 -r3fc87449b1c5b892a7f86430b7b8c49190ae56a8
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision e4657f6c590eed9c6af43a9739b87b81a34a8144)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 3fc87449b1c5b892a7f86430b7b8c49190ae56a8)
@@ -1897,23 +1897,21 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetConcentratePumpDataPublishIntervalOverride function overrides the
- * concentrate pump data publish interval.
+ * The testSetChemDisinfectionCD2AvgOverride function overrides the
+ * CD2 acid value in chemical disinfect.
  * @details Inputs: none
- * @details Outputs: concentratePumpDataPublishInterval
+ * @details Outputs: acidDataStatus.acidCondAvgUSPCM
  * @param value override concentrate pump data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetChemDisinfectionCD2AvgOverride( U32 value )
+BOOL testSetChemDisinfectionCD2AvgOverride( F32 value )
 {
     BOOL result = FALSE;
 
     if ( TRUE == isTestingActivated() )
     {
-        U32 intvl = value / TASK_GENERAL_INTERVAL;
-
         result = TRUE;
-        acidDataStatus.acidCondAvgUSPCM.ovData = intvl;
+        acidDataStatus.acidCondAvgUSPCM.ovData = value;
         acidDataStatus.acidCondAvgUSPCM.override = OVERRIDE_KEY;
     }
 
@@ -1923,9 +1921,9 @@
 /*********************************************************************//**
  * @brief
  * The testResetConcentratePumpDataPublishIntervalOverride function resets the
- * override of the concentrate pump data publish interval.
+ * override of the CD2 acid value in chemical disinfect.
  * @details Inputs: none
- * @details Outputs: concentratePumpDataPublishInterval
+ * @details Outputs: acidDataStatus.acidCondAvgUSPCM
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetChemDisinfectionCD2AvgOverride( void )
@@ -1941,7 +1939,6 @@
 
     return result;
 }
-
 /**@}*/
 
 // ********** Nelson Support Functions **********
Index: firmware/App/Modes/ModeChemicalDisinfect.h
===================================================================
diff -u -r56ba1b163b0cbf6953638065b2108f745b17ec8f -r3fc87449b1c5b892a7f86430b7b8c49190ae56a8
--- firmware/App/Modes/ModeChemicalDisinfect.h	(.../ModeChemicalDisinfect.h)	(revision 56ba1b163b0cbf6953638065b2108f745b17ec8f)
+++ firmware/App/Modes/ModeChemicalDisinfect.h	(.../ModeChemicalDisinfect.h)	(revision 3fc87449b1c5b892a7f86430b7b8c49190ae56a8)
@@ -47,6 +47,8 @@
 DG_CHEM_DISINFECT_STATE_T getCurrentChemicalDisinfectState( void );  // get the current state of the chemical disinfection mode.
 
 BOOL stopChemicalDisinfect( void );
+BOOL testSetChemDisinfectionCD2AvgOverride( F32 value );
+BOOL testResetChemDisinfectionCD2AvgOverride( void )
 
 #ifndef _RELEASE_
 void setChemNelsonSupportMode( NELSON_SUPPORT_T support );
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rf910ec24ca3b5b5756aafa88d9121317433ec1f3 -r3fc87449b1c5b892a7f86430b7b8c49190ae56a8
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f910ec24ca3b5b5756aafa88d9121317433ec1f3)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3fc87449b1c5b892a7f86430b7b8c49190ae56a8)
@@ -1398,6 +1398,10 @@
                 handleTestDG77CStateTimerOverride( message );
                 break;
 
+            case MSG_ID_DG_CHEM_DISINFECT_ACID_OVERRIDE:
+                handleTestChemDisinfectAcidOverride( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r16c0f816fadfa45b51467c5292ba9ecf7a3914bd -r3fc87449b1c5b892a7f86430b7b8c49190ae56a8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 16c0f816fadfa45b51467c5292ba9ecf7a3914bd)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3fc87449b1c5b892a7f86430b7b8c49190ae56a8)
@@ -5129,4 +5129,35 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestChemDisinfectAcidOverride function handles a request
+ * to override the CD2 moving average in Chem disinfection.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestChemDisinfectAcidOverride( MESSAGE_T * message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetChemDisinfectionCD2AvgOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetChemDisinfectionCD2AvgOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
 /**@}*/
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r16c0f816fadfa45b51467c5292ba9ecf7a3914bd -r3fc87449b1c5b892a7f86430b7b8c49190ae56a8
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 16c0f816fadfa45b51467c5292ba9ecf7a3914bd)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3fc87449b1c5b892a7f86430b7b8c49190ae56a8)
@@ -538,6 +538,9 @@
 // MSG_ID_DG_STATE_TIMER_82C_OVERRIDE
 void handleTestDG82CStateTimerOverride( MESSAGE_T* message );
 
+// MSG_ID_DG_CHEM_DISINFECT_ACID_OVERRIDE
+void handleTestChemDisinfectAcidOverride( MESSAGE_T* message );
+
 /**@}*/
 
 #endif