Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r4f3b9e168915ab13dfcdc74462d7142115cc2d57 -rd0e3bb3d509ad4583a821c9448eda0c908f3dc63
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 4f3b9e168915ab13dfcdc74462d7142115cc2d57)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision d0e3bb3d509ad4583a821c9448eda0c908f3dc63)
@@ -81,6 +81,7 @@
 
 #define PSI_TO_MMHG                         ( 51.7149F )                                    ///< Conversion factor for converting PSI to mmHg.
 
+// The new arterial pressure sensor is the same as the venous pressure sensor
 #define VENOUS_PRESSURE_NORMAL_OP           0                                               ///< Venous pressure status bits indicate normal operation.
 #define VENOUS_PRESSURE_CMD_MODE            1                                               ///< Venous pressure status bits indicate sensor in command mode.
 #define VENOUS_PRESSURE_STALE_DATA          2                                               ///< Venous pressure status bits indicate data is stale (no new data since last fpga read).
@@ -829,7 +830,6 @@
                 }
             }
         }
-
         // Check for occlusion in Treatment modes where pumps are moving
         else if ( MODE_TREA == getCurrentOperationMode() )
         {
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r27556b6433949f1d69c0ad954c7019af68bf5b29 -rd0e3bb3d509ad4583a821c9448eda0c908f3dc63
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 27556b6433949f1d69c0ad954c7019af68bf5b29)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d0e3bb3d509ad4583a821c9448eda0c908f3dc63)
@@ -76,6 +76,9 @@
 /// Interval (in task intervals) at which to publish standby mode data to CAN bus.
 static OVERRIDE_U32_T standbyModePublishInterval = { DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, 0 };
 
+static const U32 SERVICE_TIME_INTERVAL_S = (U32)( 365 * 0.5 * SECONDS_IN_A_DAY );              ///< HD/DG 6-month service interval in seconds.
+static BOOL homingInitiated;                                                                   ///< Flag indicates actuator homing has been initiated from standby mode.
+
 // ********** private function prototypes **********
 
 static HD_STANDBY_STATE_T handleStandbyModeStartState( void );
Index: firmware/App/Modes/ModeStandby.h
===================================================================
diff -u -r27556b6433949f1d69c0ad954c7019af68bf5b29 -rd0e3bb3d509ad4583a821c9448eda0c908f3dc63
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 27556b6433949f1d69c0ad954c7019af68bf5b29)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision d0e3bb3d509ad4583a821c9448eda0c908f3dc63)
@@ -40,10 +40,11 @@
 BOOL signalUserInitiateTreatment( void );                       // User has initiated a treatment - go to treatment parameters mode
 void signalNoDisinfectRequired( void );                         // User has aborted a treatment prior to introduction of blood - no disinfect required afterward
 void signalAlarmActionToStandbyMode( ALARM_ACTION_T action );   // Execute alarm action as appropriate for Standby mode
-BOOL signalUserInitiateFlushMode( void );
-BOOL signalUserInitiateHeatDisinfectMode( void );
-BOOL signalUserInitiateChemicalDisinfectMode( void );
-BOOL signalUserInitiateChemcialDisinfectFlushMode( void );
+BOOL signalUserInitiateFlushMode( void );                       // User has requested to start flush
+BOOL signalUserInitiateHeatDisinfectMode( void );               // User has requested to start heat disinfection
+BOOL signalUserInitiateChemicalDisinfectMode( void );           // User has requested to start chem disinfection
+BOOL signalUserInitiateChemcialDisinfectFlushMode( void );      // User has requested to start chem flush
+BOOL signalInitiateStandbyDisinfectSubmode( U32 cmd );          // UI has signaled user will be selecting a cleaning operation to perform
 BOOL signalUserInitiateROPermeateSampleMode( void );
 BOOL signalInitiateStandbyDisinfectSubmode( U32 cmd );
 void signalROPermeateSampleDGReadyToDispense( void );
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r4f3b9e168915ab13dfcdc74462d7142115cc2d57 -rd0e3bb3d509ad4583a821c9448eda0c908f3dc63
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 4f3b9e168915ab13dfcdc74462d7142115cc2d57)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision d0e3bb3d509ad4583a821c9448eda0c908f3dc63)
@@ -128,7 +128,6 @@
 
 static U32 treatmentStartTimeStamp;                             ///< Treatment start timestampt for logging purpose.
 static U32 treatmentEndTimeStamp;                               ///< Treatment end timestampt for logging purpose.
-static BOOL hasTreatmentStartTimeBeenWrittenToNV;               ///< Boolean flag to indicate whether treatment start time has been started or not.
 
 // ********** private function prototypes **********
 
@@ -195,7 +194,6 @@
 
     treatmentStartTimeStamp = getRTCTimestamp();
     treatmentEndTimeStamp = 0;
-    hasTreatmentStartTimeBeenWrittenToNV = FALSE;
 }
 
 /*********************************************************************//**
@@ -221,6 +219,9 @@
         initTreatmentEnd();
     }
 
+    // Started the treatment set the start time in epoch
+    setTxLastStartTimeEpoch( getRTCTimestamp() );
+
     setCurrentSubState( NO_SUB_STATE );
     // Enable venous bubble detection in treatment mode
     setVenousBubbleDetectionEnabled( TRUE );
@@ -629,13 +630,6 @@
         checkDialysateTemperature();
     }
 
-    // Record treatment start time if not done yet
-    if ( FALSE == hasTreatmentStartTimeBeenWrittenToNV )
-    {
-        // Started the treatment set the start time in epoch
-        hasTreatmentStartTimeBeenWrittenToNV = setTxLastStartTimeEpoch( getRTCTimestamp() );
-    }
-
     // Treatment mode state machine
     switch ( currentTreatmentState )
     {