Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r5c083ca7d4ebd1ebd8e745c0fba7148e59894569 -r5b71511ab1de37e47a1cde5d33173144fb9bf25f
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5c083ca7d4ebd1ebd8e745c0fba7148e59894569)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5b71511ab1de37e47a1cde5d33173144fb9bf25f)
@@ -48,14 +48,13 @@
 // ********** private definitions **********
 
 #define DISINFECTS_DATA_PUB_INTERVAL          ( 1 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )    ///< Disinfects data publish interval in counts.
-#define DISINFECTS_TIME_INTERVAL_S            ( 3 * SECONDS_IN_A_DAY )                         ///< HD/DG 2-day service interval in seconds.
+#define DISINFECTS_TIME_INTERVAL_S            ( 3 * SECONDS_IN_A_DAY )                         ///< HD/DG 3-day service interval in seconds.
 #define FLUSH_TIME_INTERVAL_S                 ( 30 * SEC_PER_MIN * MS_PER_SECOND )             ///< Flush time interval in seconds.
 #define MAX_ALLOWED_RO_FILTER_TEMP_FOR_TX_C   44.0F                                            ///< Maximum allowed temperature to start a treatment in C.
 
 // ********** private data **********
 
 static HD_STANDBY_STATE_T currentStandbyState;                                                 ///< Current state (sub-mode) of standby mode.
-
 static BOOL treatStartReqReceived;                                                             ///< Flag indicates user has requested initiation of a treatment.
 static BOOL flushStartReqReceived;                                                             ///< Flag indicates user has requested initiation of flush mode.
 static BOOL heatDisinfectStartReqReceived;                                                     ///< Flag indicates user has requested initiation of heat disinfect mode.
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5c083ca7d4ebd1ebd8e745c0fba7148e59894569 -r5b71511ab1de37e47a1cde5d33173144fb9bf25f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5c083ca7d4ebd1ebd8e745c0fba7148e59894569)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5b71511ab1de37e47a1cde5d33173144fb9bf25f)
@@ -1054,7 +1054,7 @@
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, &reason, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, alarmList, sizeof( U32 ) );
+    memcpy( payloadPtr, alarmList, size );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     return serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
@@ -8012,7 +8012,7 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( 0 == message->hdr.payloadLen )
+    if ( ( 0 == message->hdr.payloadLen ) && ( TRUE == isTestingActivated() ) )
     {
         signalDialInPumpHardStop();
     }
@@ -8035,7 +8035,7 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( 0 == message->hdr.payloadLen )
+    if ( ( 0 == message->hdr.payloadLen ) && ( TRUE == isTestingActivated() ) )
     {
         signalDialOutPumpHardStop();
     }
@@ -8058,7 +8058,7 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( 0 == message->hdr.payloadLen )
+    if ( ( 0 == message->hdr.payloadLen ) && ( TRUE == isTestingActivated() ) )
     {
         signalBloodPumpHardStop();
     }