Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r752defbb739ea0756a8bf060f00bc6b9429c2764 -r8a42ba4060bf15e63d291fa23df6fcd5434beab4
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 752defbb739ea0756a8bf060f00bc6b9429c2764)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8a42ba4060bf15e63d291fa23df6fcd5434beab4)
@@ -1531,7 +1531,14 @@
         result = TRUE;
         memcpy( &drainCmd, message->payload, sizeof( DRAIN_CMD_T ) );
 
-        startDrainCmd( drainCmd );
+        if ( DG_CMD_START == drainCmd.cmd )
+        {
+            startDrainCmd( drainCmd );
+        }
+        else
+        {
+            stopDrainCmd();
+        }
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
@@ -3587,6 +3594,27 @@
 
 /*********************************************************************//**
 * @brief
+* The handleStopDGRTCClock function handles a request to stop the RTC clock.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleStopDGRTCClock( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( 0 == message->hdr.payloadLen )
+    {
+        testSetStopRTC();
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
 * The handleStartStopDGChemicalDisinfect function handles a request to start
 * or stop DG chemical disinfect mode.
 * @details Inputs: none