Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r92a0a399021a2d120155b0a779855893284b8cbb -r7537349102446481ceb93be0147b757323652f24
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 92a0a399021a2d120155b0a779855893284b8cbb)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 7537349102446481ceb93be0147b757323652f24)
@@ -330,6 +330,7 @@
     }
     else
     {
+        cmdResponse.commandID = DG_CMD_STOP_TRIMMER_HEATER;
         hasStartTrimmerHeaterRequested = FALSE;
         hasStopTrimmerHeaterRequested = TRUE;
         cmdResponse.rejected = FALSE;
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r799b1f2e7a128ce670e7c4cdfd60f7991534b699 -r7537349102446481ceb93be0147b757323652f24
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 799b1f2e7a128ce670e7c4cdfd60f7991534b699)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7537349102446481ceb93be0147b757323652f24)
@@ -54,9 +54,9 @@
 #define MAX_COMM_CRC_FAILURES           5                                   ///< maximum number of CRC errors within window period before alarm
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
 
-#define MSG_NOT_ACKED_TIMEOUT_MS    ( MS_PER_SECOND * 1 )                   ///< maximum time for a Denali message that requires ACK to be ACK'd
-#define MSG_NOT_ACKED_MAX_RETRIES   3                                       ///< maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
-#define PENDING_ACK_LIST_SIZE       25                                      ///< maximum number of Delanli messages that can be pending ACK at any given time
+#define MSG_NOT_ACKED_TIMEOUT_MS        300                                 ///< maximum time for a Denali message that requires ACK to be ACK'd
+#define MSG_NOT_ACKED_MAX_RETRIES       3                                   ///< maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
+#define PENDING_ACK_LIST_SIZE           25                                  ///< maximum number of Delanli messages that can be pending ACK at any given time
 
 #pragma pack(push, 1)
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r667b78a4ba1b948d4977b9b55234acf8d670f2d9 -r7537349102446481ceb93be0147b757323652f24
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 667b78a4ba1b948d4977b9b55234acf8d670f2d9)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7537349102446481ceb93be0147b757323652f24)
@@ -103,7 +103,7 @@
     U08 crc;
     U08 data[ MAX_ACK_MSG_SIZE ];  // byte array to populate with message data
 
-    // Check to see if tester has requested this message not be transmited
+    // Check to see if tester has requested this message not be transmitted
     if ( TRUE == isTestingActivated() )
     {
         U32 i;