Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r39c83612c7d83075cded8b7e1c8030898cdb5ad9 -rf502a589b7a6c39c6fd57ceee778f5c94481af14
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 39c83612c7d83075cded8b7e1c8030898cdb5ad9)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision f502a589b7a6c39c6fd57ceee778f5c94481af14)
@@ -79,7 +79,6 @@
 #define RSRVRS_FILL_UP_TIMEOUT_MS                   ( 8 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 full fill up timeout in ms.
 #define RSRVRS_PARTIAL_FILL_UP_TIMEOUT_MS           ( 7 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 partial fill up timeout in ms.
 #define RSRVRS_ALMOST_FULL_FILL_UP_TIMEOUT_MS       ( 1 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 partial fill up timeout in ms. It is assumed the reservoir is nearly full to begin.
-#define RESERVOIR_FULL_VOLUME_CHANGE_LIMIT_ML       5.0F                                                       ///< The maximum difference between the short-term and long-term filtered reservoir volumes in ml that determines the reservoir is full.
 #define RESERVOIR_MINIMUM_FULL_VOLUME_ML            1850.0F                                                    ///< When filling the reservoir, the volume reading must be at least this value before checking for the volume to level off.
 #define RSRVRS_FILL_TO_FULL_STABLE_TASK_INT         ( ( 2 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )          ///< Reservoirs 1 & 2 full stable time in task intervals.
 
@@ -878,6 +877,7 @@
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD1, VALVE_STATE_CLOSED );
             setValveState( VRD2, VALVE_STATE_CLOSED );
+            turnOffUVReactor( OUTLET_UV_REACTOR );
             rsrvr1Status                               = DG_RESERVOIR_BELOW_TARGET;
             rsrvr2Status                               = DG_RESERVOIR_BELOW_TARGET;
             chemDisinfectReservoirTime                 = 0;
@@ -1325,14 +1325,16 @@
  *************************************************************************/
 static void failChemicalDisinfect( void )
 {
+    // If a fault alarm is active go to mode fault otherwise for cleaning mode alarms, transition to standby
+    DG_OP_MODE_T nextOpMode = ( FALSE == isDGFaultAlarmActive() ? DG_MODE_STAN : DG_MODE_FAUL );
+
     // In the cleaning modes the alarms are triggered but the mode is not transitioned to fault automatically
     // so transition to fault mode is done here
     if ( alarmDetectedPendingTrigger != ALARM_ID_NO_ALARM )
     {
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevChemDisinfectState )
     }
-
-    requestNewOperationMode( DG_MODE_STAN );
+    requestNewOperationMode( nextOpMode );
 }
 
 /*********************************************************************//**
@@ -1449,25 +1451,22 @@
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_BELOW_TARGET;
     F32 currentVolume            = 0.0F;
-    F32 filteredVolume           = 0.0F;
 
     if ( DG_RESERVOIR_1 == r )
     {
         currentVolume  = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
-        filteredVolume = getLoadCellLargeFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
     }
     else if ( DG_RESERVOIR_2 == r )
     {
         currentVolume  = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
-        filteredVolume = getLoadCellLargeFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
     }
     else
     {
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DG_RESERVOIR_SELECTED, r )
     }
 
     // Check the volume of the reservoir against the long term filtered volume
-    if ( ( currentVolume > RESERVOIR_MINIMUM_FULL_VOLUME_ML ) && ( fabs( currentVolume - filteredVolume ) < RESERVOIR_FULL_VOLUME_CHANGE_LIMIT_ML ) )
+    if ( currentVolume > RESERVOIR_MINIMUM_FULL_VOLUME_ML )
     {
         if ( ++rsrvrFillToFullStableTimeCounter >= RSRVRS_FILL_TO_FULL_STABLE_TASK_INT )
         {