Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -rf1157c760b320bf088921a25eb78e973d6341578 -r8126d8e97c5626d71c7b807fa9f95601248d6dbb
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision f1157c760b320bf088921a25eb78e973d6341578)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 8126d8e97c5626d71c7b807fa9f95601248d6dbb)
@@ -61,7 +61,7 @@
 SELF_TEST_STATUS_T execBloodLeakSelfTest( void );
 
 BLOOD_LEAK_STATUS_T getBloodLeakStatus( void );
-SELF_TEST_STATUS_T getBloodLeakSelfTestStatus( void );
+SELF_TEST_STATUS_T  getBloodLeakSelfTestStatus( void );
 
 BOOL testSetBloodLeakDataPublishIntervalOverride( U32 value );
 BOOL testResetBloodLeakDataPublishIntervalOverride( void );
Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rf1157c760b320bf088921a25eb78e973d6341578 -r8126d8e97c5626d71c7b807fa9f95601248d6dbb
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision f1157c760b320bf088921a25eb78e973d6341578)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 8126d8e97c5626d71c7b807fa9f95601248d6dbb)
@@ -233,7 +233,7 @@
  *************************************************************************/
 void execDGInterfaceMonitor( void )
 {
-    if ( isACPowerLost() != TRUE )
+    if ( FALSE == isACPowerLost() )
     {
         // Trigger alarm if not receiving new load cell data message in timely manner
         checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag );
@@ -460,14 +460,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDialysateTemperature function gets the latest dialysate temperature.
- * @details Inputs: dgDialysateTemp
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
  * @details Outputs: none
- * @return the current dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
@@ -501,11 +501,11 @@
  * The getDGDisinfectsStates function returns the DG disinfects readings.
  * @details Inputs: none
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the current dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
@@ -1304,7 +1304,7 @@
     U32 trimmerState  = dgHeatersData.trimmerHeaterState;
     DG_OP_MODE_T dgOp = getDGOpMode();
 
-    if ( isACPowerLost() != TRUE )
+    if ( FALSE == isACPowerLost() )
     {
         if ( ( DG_MODE_GENE == dgOp ) || ( DG_MODE_FILL == dgOp ) || ( DG_MODE_DRAI == dgOp ) )
         {
Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -rf1157c760b320bf088921a25eb78e973d6341578 -r8126d8e97c5626d71c7b807fa9f95601248d6dbb
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision f1157c760b320bf088921a25eb78e973d6341578)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 8126d8e97c5626d71c7b807fa9f95601248d6dbb)
@@ -121,6 +121,7 @@
 F32 getHeatDisinfectTemperatureSensorValue( void );
 BOOL getTrimmerHeaterCommandedOn( void );
 DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void );
+F32 getDialysateTemperature( void );
 DG_MIXING_RATIOS_T getDGMixingRatios( void );
 void getHDVersionDGServiceAndUsageData( DG_SERVICE_AND_USAGE_DATA_T* data );
 
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rf1157c760b320bf088921a25eb78e973d6341578 -r8126d8e97c5626d71c7b807fa9f95601248d6dbb
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f1157c760b320bf088921a25eb78e973d6341578)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8126d8e97c5626d71c7b807fa9f95601248d6dbb)
@@ -75,6 +75,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 -rf1157c760b320bf088921a25eb78e973d6341578 -r8126d8e97c5626d71c7b807fa9f95601248d6dbb
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision f1157c760b320bf088921a25eb78e973d6341578)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 8126d8e97c5626d71c7b807fa9f95601248d6dbb)
@@ -39,10 +39,11 @@
 
 BOOL signalUserInitiateTreatment( void );                       // User has initiated a treatment - go to treatment parameters mode
 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/SystemCommMessages.c
===================================================================
diff -u -rf1157c760b320bf088921a25eb78e973d6341578 -r8126d8e97c5626d71c7b807fa9f95601248d6dbb
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f1157c760b320bf088921a25eb78e973d6341578)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8126d8e97c5626d71c7b807fa9f95601248d6dbb)
@@ -5452,6 +5452,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rf1157c760b320bf088921a25eb78e973d6341578 -r8126d8e97c5626d71c7b807fa9f95601248d6dbb
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f1157c760b320bf088921a25eb78e973d6341578)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 8126d8e97c5626d71c7b807fa9f95601248d6dbb)
@@ -938,9 +938,6 @@
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
 BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response );
 
-// MSG_ID_HD_SEND_ALARMS_COMMAND
-void handleResendAllAlarmsCommand(  MESSAGE_T* message );
-
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );