Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r37a9fd8f15e413db5337371a7d1a1cb65567af7c -r27a68f930508638f2eb6265ebb381c8918cbc37b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 37a9fd8f15e413db5337371a7d1a1cb65567af7c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
@@ -152,7 +152,9 @@
             data[ msgSize++ ] = 0;
         }
 
+#ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACK_ERRORS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
         {
             // If ACK required, add to pending ACK list
             if ( TRUE == ackReq )
@@ -1822,6 +1824,7 @@
     payload.alarmsFlags |= ( almStatus.alarmsToEscalate             ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE) : 0 );
     payload.alarmsFlags |= ( almStatus.alarmsSilenced               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED)    : 0 );
     payload.alarmsFlags |= ( almStatus.lampOn                       ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON)            : 0 );
+    payload.alarmsFlags |= ( almStatus.noDialRecirc                 ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC)   : 0 );
     payload.alarmsFlags |= ( almStatus.noMinimize                   ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE)        : 0 );
     payload.alarmsFlags |= ( almStatus.topAlarmConditionDetected    ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION)      : 0 );
 
@@ -5844,6 +5847,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
+#ifndef _RELEASE_
     // Verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
@@ -5857,6 +5861,7 @@
             result = testResetValvesCurrentOverride( payload.index );
         }
     }
+#endif
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
@@ -5909,6 +5914,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
+#ifndef _RELEASE_
     // Verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
@@ -5922,6 +5928,7 @@
             result = testResetValvesPositionCountOverride( payload.index );
         }
     }
+#endif
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
@@ -6806,39 +6813,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
- * request to override the fan RPM alarm start time.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
-
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMAlarmStartTimeOffsetOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetFanRPMAlarmStartTimeOffsetOverride();
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSetFansDutyCycleOverrideRequest function handles a
  * request to override the fans duty cycle.
  * @details Inputs: none
@@ -6916,6 +6890,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
+ * request to set the fans RPM alarm start time offset.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message )
+{
+    U32 rpmTimeOffset;
+
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(U32) == message->hdr.payloadLen )
+    {
+        memcpy( &rpmTimeOffset, message->payload, sizeof(U32) );
+
+        result = testSetFanRPMAlarmStartTimestamp( rpmTimeOffset );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendHDSWConfigRecord function sends out the HD software configuration record.
  * @details Inputs: none
  * @details Outputs: HD software configuration record msg constructed and queued