Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r0c296cef29037819be204c45a23d4d38a52b2718 -r7eb83ebaf0db7cfef5d055ae0277b50e474ab016
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0c296cef29037819be204c45a23d4d38a52b2718)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7eb83ebaf0db7cfef5d055ae0277b50e474ab016)
@@ -857,8 +857,12 @@
             handleSampleWaterCmd( message );
             break;
 
+        case MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD:
+            handleHDStartStopTrimmerHeaterCmd( message );
+            break;
+
         case MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD:
-            handleStartStopTrimmerHeaterCmd( message );
+            handleDGStartStopTrimmerHeater( message );
             break;
 
         case MSG_ID_DG_START_STOP_FLUSH:
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r0c296cef29037819be204c45a23d4d38a52b2718 -r7eb83ebaf0db7cfef5d055ae0277b50e474ab016
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0c296cef29037819be204c45a23d4d38a52b2718)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7eb83ebaf0db7cfef5d055ae0277b50e474ab016)
@@ -1044,7 +1044,7 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message )
+void handleHDStartStopTrimmerHeaterCmd( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
@@ -1282,6 +1282,41 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The handleDGStartStopTrimmerHeater function handles a request start or
+ * stop the trimmer heater
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return result
+ *************************************************************************/
+BOOL handleDGStartStopTrimmerHeater( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    {
+        BOOL startingHeater;
+
+        memcpy( &startingHeater, message->payload, sizeof( U32 ) );
+
+        if ( TRUE == startingHeater )
+        {
+            result = startHeater( DG_TRIMMER_HEATER );
+        }
+        else
+        {
+            stopHeater( DG_TRIMMER_HEATER );
+            result = TRUE;
+        }
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
+
+    return result;
+}
+
+/*********************************************************************//**
 * @brief
 * The handleStartStopDGChemicalDisinfect function handles a request to start
 * or stop DG chemical disinfect mode.
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r0c296cef29037819be204c45a23d4d38a52b2718 -r7eb83ebaf0db7cfef5d055ae0277b50e474ab016
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 0c296cef29037819be204c45a23d4d38a52b2718)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 7eb83ebaf0db7cfef5d055ae0277b50e474ab016)
@@ -125,8 +125,11 @@
 BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );
 
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
-void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message );
+BOOL handleDGStartStopTrimmerHeater( MESSAGE_T *message );
 
+// MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD
+void handleHDStartStopTrimmerHeaterCmd( MESSAGE_T *message );
+
 // MSG_ID_DG_SEND_CALIBRATION_DATA
 BOOL sendDGCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress );