Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rfa09ed93f0786712108539a50370aae404335d5e -r93383819b0f9b7bb0be3acb95f368ee6b8d8080a
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fa09ed93f0786712108539a50370aae404335d5e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 93383819b0f9b7bb0be3acb95f368ee6b8d8080a)
@@ -54,7 +54,7 @@
 #define MSG_NOT_ACKED_TIMEOUT_MS        150     ///< Maximum time for a Denali message that requires ACK to be ACK'd
 
 #define MSG_NOT_ACKED_TIMEOUT_MS_INIT   5000    ///< Maximum time for a Denali message that requires ACK to be ACK'd on the INIT state for the first (UI version request) message of the POST
-#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 MSG_NOT_ACKED_MAX_RETRIES       20      ///< 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 Denali messages that can be pending ACK at any given time
 
 #pragma pack(push, 1)
@@ -888,13 +888,7 @@
     // Find expired messages pending ACK
     for ( i = 0; i < PENDING_ACK_LIST_SIZE; i++ )
     {   // Pending ACK expired?
-        U32 timeoutPeriod = MSG_NOT_ACKED_TIMEOUT_MS; // set the timeout as default
-
-        if ( MODE_INIT == getCurrentOperationMode() )
-        { // change it to longer timeout if the HD is in INIT state
-            timeoutPeriod = MSG_NOT_ACKED_TIMEOUT_MS_INIT;
-        }
-        if ( ( TRUE == pendingAckList[ i ].used ) && ( TRUE == didTimeout( pendingAckList[ i ].timeStamp, timeoutPeriod ) ) )
+        if ( ( TRUE == pendingAckList[ i ].used ) && ( TRUE == didTimeout( pendingAckList[ i ].timeStamp, MSG_NOT_ACKED_TIMEOUT_MS ) ) )
         {   // If retries left, reset and resend pending message
             if ( pendingAckList[ i ].retries > 0 )
             {   // Re-queue message for transmit