Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r388a6f1cf7661a973b0b08c2eeb4de30522c1e88 -r1e044a958c655d09fed725cfbc9808319b642d13
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 388a6f1cf7661a973b0b08c2eeb4de30522c1e88)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1e044a958c655d09fed725cfbc9808319b642d13)
@@ -36,6 +36,7 @@
 #include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
+#include "ModeHeatDisinfect.h"
 
 // ********** private definitions **********
 
@@ -967,6 +968,42 @@
 }
 
 /*************************************************************************
+ * @brief
+ * The handleStartStopDGHeatDisinfect function handles a request start or
+ * stop DG heat disifect
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return result
+ *************************************************************************/
+BOOL handleStartStopDGHeatDisinfect( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(U32) )
+    {
+        BOOL startingDGHeatDisinfect;
+
+        memcpy( &startingDGHeatDisinfect, message->payload, sizeof(U32) );
+
+        if ( TRUE == startingDGHeatDisinfect )
+        {
+            startDGHeatDisinfect();
+            result = TRUE;
+        }
+        else
+        {
+            stopDGHeatDisinfect();
+            result = TRUE;
+        }
+    }
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
+
+    return result;
+}
+
+/*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
@@ -1184,8 +1221,10 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestROPumpSetPointOverrideRequest, testSetTargetROPumpPressureOverride, testResetTargetROPumpPressureOverride )
+//DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestROPumpSetPointOverrideRequest, testSetTargetROPumpPressureOverride, testResetTargetROPumpPressureOverride ) //Todo remove
 
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestROPumpSetPointOverrideRequest, testSetTargetROPumpFlowRateOverride, testResetTargetROPumpFlowRateOverride )
+
 /*************************************************************************
  * @brief
  * The handleTestROMeasuredFlowOverrideRequest function handles a request to \n