Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r29e42a928fa5f7498734dc0c95508ad1dde42d25 -r9a459ee75068d60aba63ff2d501111d7ebfdda59
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 29e42a928fa5f7498734dc0c95508ad1dde42d25)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9a459ee75068d60aba63ff2d501111d7ebfdda59)
@@ -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 -r29e42a928fa5f7498734dc0c95508ad1dde42d25 -r9a459ee75068d60aba63ff2d501111d7ebfdda59
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 29e42a928fa5f7498734dc0c95508ad1dde42d25)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 9a459ee75068d60aba63ff2d501111d7ebfdda59)
@@ -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/Services/AlarmMgmt.c
===================================================================
diff -u -reb9c877da08d5769b3c4599b2408e4a1dc4c8d93 -r9a459ee75068d60aba63ff2d501111d7ebfdda59
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision eb9c877da08d5769b3c4599b2408e4a1dc4c8d93)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9a459ee75068d60aba63ff2d501111d7ebfdda59)
@@ -254,6 +254,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The isACPowerLost function determines whether A/C power loss has
+ * been detected. This function sets the alarms blocked condition to
+ * allow smooth alarm recovery.
+ *
+ * @details Inputs: alarmStatus
+ * @details Outputs: alarmsBlockedTimer
+ * @return TRUE if A/C power loss alarm is in effect, FALSE if not
+ *************************************************************************/
+BOOL isACPowerLost( void )
+{
+    BOOL result = TRUE;
+
+    // Continue to block new alarms until the alarms are cleared.
+    if ( ( FALSE == isAlarmConditionDetected( ALARM_ID_HD_AC_POWER_LOST ) ) &&
+         ( FALSE == isAlarmConditionDetected( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT ) ) )
+    {
+        result = FALSE;
+    }
+    else
+    {
+        alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN;
+    }
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The activateAlarm function activates a given alarm.
  * @details Inputs: none
  * @details Outputs: alarmIsActive[], alarmStartedAt[], alarmStatus is updated
@@ -262,6 +289,11 @@
  *************************************************************************/
 static void activateAlarm( ALARM_ID_T alarm )
 {
+    // Block new alarms, occuring during loss of AC power
+    if ( ( TRUE == getCPLDACPowerLossDetected() ) )
+    {
+        alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN;
+    }
     // Verify valid alarm index
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {
@@ -358,12 +390,7 @@
  * @return none
  *************************************************************************/
 void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 )
-{
-    // Block if new alarms are occur during loss of AC power
-    if ( ( TRUE == getCPLDACPowerLossDetected() ) )
-    {
-        alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN;
-    }
+{
     // Sanity check, verify valid alarm index
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {