Index: firmware/App/HDCommon.h
===================================================================
diff -u -rdc8361b5010bc5a378e6c663d7b05e651fcd3555 -r5d9f15cd25ec6c4cfff7d4fcee2fa45c6dc4c165
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision dc8361b5010bc5a378e6c663d7b05e651fcd3555)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 5d9f15cd25ec6c4cfff7d4fcee2fa45c6dc4c165)
@@ -10,8 +10,8 @@
 * @author  (last)      Sean Nash
 * @date    (last)      24-Aug-2023
 *
-* @author  (original)  Sean
-* @date    (original)  27-Feb-2020
+* @author  (original) Sean
+* @date    (original) 27-Feb-2020
 *
 ***************************************************************************/
 
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r6fa37e66ea5aa6be96225821768c8cfd9be78a6a -r5d9f15cd25ec6c4cfff7d4fcee2fa45c6dc4c165
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 6fa37e66ea5aa6be96225821768c8cfd9be78a6a)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 5d9f15cd25ec6c4cfff7d4fcee2fa45c6dc4c165)
@@ -893,7 +893,6 @@
         // Reset bolus data before we start
         bolusSalineVolumeDelivered_mL = 0.0;
         bolusSalineLastVolumeTimeStamp = getMSTimerCount();
-
         // Bypass dialyzer
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd7f726915d3a4a8dcd4e8c04974cfb2ccf294ce3 -r5d9f15cd25ec6c4cfff7d4fcee2fa45c6dc4c165
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d7f726915d3a4a8dcd4e8c04974cfb2ccf294ce3)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5d9f15cd25ec6c4cfff7d4fcee2fa45c6dc4c165)
@@ -1669,6 +1669,7 @@
         U32 epoch;
 
         memcpy( &epoch,  message->payload, sizeof( U32 ) );
+        isEpochValid ( epoch );
         result = setRTCEpoch( epoch );
         if ( FALSE == result )
         {