Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r4f8f1ab7fb6ebd3ca87663784cbccdf685ff77f1 -rc75eec67d9af099ca27555bb9dd8d7187d9a0169
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 4f8f1ab7fb6ebd3ca87663784cbccdf685ff77f1)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision c75eec67d9af099ca27555bb9dd8d7187d9a0169)
@@ -25,7 +25,7 @@
 #include "ModeInitPOST.h"
 #include "ModeTreatment.h"
 #include "ModeTreatmentParams.h"
-#include "OperationModes.h"
+#include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
@@ -58,12 +58,12 @@
 
 // ********** private data **********
 
-// DG status
-static DG_OP_MODE_T dgCurrentOpMode;                                        ///< Current DG operation mode.
+// DG status
+static DG_OP_MODE_T dgCurrentOpMode;                                        ///< Current DG operation mode.
 static U32 dgSubMode;                                                       ///< Current state (sub-mode) of current DG operation mode.
-static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
-static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
-static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
+static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
+static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
+static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
 
 // DG sensor data
 static F32 dgDialysateTemp;                                                 ///< Dialysate temperature reported by the DG.
@@ -125,8 +125,8 @@
     U32 i, j;
 
     // NOTE: the active reservoir is set to reservoir 1 since DG will send active reservoir 1 as active on power up
-    dgStarted                       = FALSE;
-    dgTrimmerHeaterOn               = FALSE;
+    dgStarted                       = FALSE;
+    dgTrimmerHeaterOn               = FALSE;
     dgTrimmerTempSet                = 0.0F;
     dgTrimmerTempCheckTimerCtr      = 0;
     dgActiveReservoirSet            = DG_RESERVOIR_2;
@@ -458,14 +458,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 latest dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
@@ -509,14 +509,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDGDisinfectsStates function returns the DG disinfects readings.
- * @details Inputs: disinfectsStatus
+ * The getDialysateTemperature function returns the DG dialysate temperature.
+ * @details Inputs: dgDialysateTemp
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the latest dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r70654c8e042da0dd7ee7dc37c21bd8f4d54544e7 -rc75eec67d9af099ca27555bb9dd8d7187d9a0169
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 70654c8e042da0dd7ee7dc37c21bd8f4d54544e7)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision c75eec67d9af099ca27555bb9dd8d7187d9a0169)
@@ -118,6 +118,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/Services/SystemCommMessages.c
===================================================================
diff -u -r539205b48b44c0b26f30b5341ad97db3decac52a -rc75eec67d9af099ca27555bb9dd8d7187d9a0169
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 539205b48b44c0b26f30b5341ad97db3decac52a)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c75eec67d9af099ca27555bb9dd8d7187d9a0169)
@@ -5788,6 +5788,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 -r70654c8e042da0dd7ee7dc37c21bd8f4d54544e7 -rc75eec67d9af099ca27555bb9dd8d7187d9a0169
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 70654c8e042da0dd7ee7dc37c21bd8f4d54544e7)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c75eec67d9af099ca27555bb9dd8d7187d9a0169)
@@ -952,9 +952,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 );