Index: firmware/App/Controllers/UVReactors.c
===================================================================
diff -u -r72bca5d2e489fa253f3bdfdb254261a32c7a0c19 -r4dc00d3bb62964e1d93782af96185f55b7eba30e
--- firmware/App/Controllers/UVReactors.c	(.../UVReactors.c)	(revision 72bca5d2e489fa253f3bdfdb254261a32c7a0c19)
+++ firmware/App/Controllers/UVReactors.c	(.../UVReactors.c)	(revision 4dc00d3bb62964e1d93782af96185f55b7eba30e)
@@ -357,7 +357,7 @@
             {
                 activateAlarmNoData( ALARM_ID_DG_INLET_UV_REACTOR_NOT_HEALTHY );
             }
-            else if ( FALSE == isOutletHealthy )
+            if ( FALSE == isOutletHealthy )
             {
                 activateAlarmNoData( ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY );
             }
Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r5026ed04bc2977e2a6d8c854b1e356cbfb2febea -r4dc00d3bb62964e1d93782af96185f55b7eba30e
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 5026ed04bc2977e2a6d8c854b1e356cbfb2febea)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 4dc00d3bb62964e1d93782af96185f55b7eba30e)
@@ -183,7 +183,7 @@
  * support the special conditions that are needed to be created to test the disinfects. The support codes are not compiled in a release
  * build.
  */
-static NELSON_SUPPORT_T nelsonSupport;                                                                         ///< Nelson support.
+static NELSON_SUPPORT_T nelsonSupport;                                                                         // Nelson support.
 #endif
 
 // ********** private function prototypes **********
@@ -451,22 +451,6 @@
     return status;
 }
 
-#ifndef _RELEASE_
-/*********************************************************************//**
- * @brief
- * The setNelsonSupportMode function sets the requested Nelson support
- * mode (i.e. inoculate, ...)
- * @details Inputs: none
- * @details Outputs: nelsonSupport
- * @param support the type Nelson support (i.e. inoculate, heat disinfect)
- * @return none
- *************************************************************************/
-void setChemNelsonSupportMode( NELSON_SUPPORT_T support )
-{
-    nelsonSupport = support;
-}
-#endif
-
 // ********** private functions **********
 
 /*********************************************************************//**
@@ -1330,10 +1314,6 @@
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevChemDisinfectState )
     }
 
-#ifndef _RELEASE_
-   nelsonSupport = NELSON_NONE;
-#endif
-
     requestNewOperationMode( DG_MODE_FAUL );
 }
 
@@ -1633,7 +1613,6 @@
         data.overallElapsedTime = calcTimeSince( overallChemDisinfectTimer );
         data.stateElapsedTime   = calcTimeSince( stateTimer );
         data.cancellationMode   = (U32)cancellationMode;
-        data.nelsonSupportMode  = (U32)nelsonSupport;
 
         //If the mode is in the actual chemical disinfect states, publish the elapsed time, otherwise publish 0 to avoid confusion
         if ( chemDisinfectState > DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN  )
@@ -1772,11 +1751,29 @@
     }
 }
 
+/**@}*/
+
 // ********** Nelson Support Functions **********
 
 #ifndef _RELEASE_
 /*********************************************************************//**
  * @brief
+ * The setNelsonSupportMode function sets the requested Nelson support
+ * mode (i.e. inoculate, ...)
+ * @details Inputs: none
+ * @details Outputs: nelsonSupport
+ * @param support the type Nelson support (i.e. inoculate, heat disinfect)
+ * @return none
+ *************************************************************************/
+void setChemNelsonSupportMode( NELSON_SUPPORT_T support )
+{
+    nelsonSupport = support;
+}
+#endif
+
+#ifndef _RELEASE_
+/*********************************************************************//**
+ * @brief
  * The setNelsonSupportConditions function sets the disinfect variables for
  * Nelson support.
  * @details Inputs: nelsonSupport
@@ -1825,5 +1822,3 @@
     }
 }
 #endif
-
-/**@}*/
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r5026ed04bc2977e2a6d8c854b1e356cbfb2febea -r4dc00d3bb62964e1d93782af96185f55b7eba30e
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 5026ed04bc2977e2a6d8c854b1e356cbfb2febea)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 4dc00d3bb62964e1d93782af96185f55b7eba30e)
@@ -192,7 +192,7 @@
  * support the special conditions that are needed to be created to test the disinfects. The support codes are not compiled in a release
  * build.
  */
-static NELSON_SUPPORT_T nelsonSupport;                                                                         ///< Nelson support.
+static NELSON_SUPPORT_T nelsonSupport;                                                                         // Nelson support.
 #endif
 
 // ********** private function prototypes **********
@@ -483,22 +483,6 @@
     return status;
 }
 
-#ifndef _RELEASE_
-/*********************************************************************//**
- * @brief
- * The setHeatNelsonSupportMode function sets the requested Nelson support
- * mode (i.e. inoculate, ...)
- * @details Inputs: none
- * @details Outputs: nelsonSupport
- * @param support the type Nelson support (i.e. inoculate, heat disinfect)
- * @return none
- *************************************************************************/
-void setHeatNelsonSupportMode( NELSON_SUPPORT_T support )
-{
-    nelsonSupport = support;
-}
-#endif
-
 // ********** private functions **********
 
 /*********************************************************************//**
@@ -1945,7 +1929,6 @@
         uiData.r82CountdownTimeS       = ( 0 == timeStatus[ RSRVR_AT_82_C ].startTimeMS ? 0 : ( timeStatus[ RSRVR_AT_82_C ].targetTimeMS - calcTimeSince( timeStatus[ RSRVR_AT_82_C ].startTimeMS ) ) / 1000 );
         data.R1FillLevel               = rsrvr1RefVolML;
         data.R2FillLevel               = rsrvr2RefVolML;
-        data.nelsonSupportMode         = (U32)nelsonSupport;
 
         broadcastData( MSG_ID_DG_HEAT_DISINFECT_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( MODE_HEAT_DISINFECT_DATA_T ) );
         broadcastData( MSG_ID_DG_HEAT_DISINFECT_TIME_DATA, COMM_BUFFER_OUT_CAN_DG_2_UI, (U08*)&uiData, sizeof( MODE_HEAT_DISINFECT_UI_DATA_T ) );
@@ -2010,6 +1993,8 @@
     }
 }
 
+/**@}*/
+
 // ********** Nelson Support Functions **********
 
 #ifndef _RELEASE_
@@ -2177,4 +2162,18 @@
 
 #endif
 
-/**@}*/
+#ifndef _RELEASE_
+/*********************************************************************//**
+ * @brief
+ * The setHeatNelsonSupportMode function sets the requested Nelson support
+ * mode (i.e. inoculate, ...)
+ * @details Inputs: none
+ * @details Outputs: nelsonSupport
+ * @param support the type Nelson support (i.e. inoculate, heat disinfect)
+ * @return none
+ *************************************************************************/
+void setHeatNelsonSupportMode( NELSON_SUPPORT_T support )
+{
+    nelsonSupport = support;
+}
+#endif
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3850bef541c43c1fb81663eb7d1ca6c98e933627 -r4dc00d3bb62964e1d93782af96185f55b7eba30e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3850bef541c43c1fb81663eb7d1ca6c98e933627)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4dc00d3bb62964e1d93782af96185f55b7eba30e)
@@ -4335,6 +4335,7 @@
         memcpy( &payload, message->payload, sizeof( U32 ) );
 
         nelson = (NELSON_SUPPORT_T)payload;
+        result = TRUE;
 
         switch( nelson )
         {
@@ -4356,6 +4357,7 @@
             case NELSON_POS_CONTROL_HEAT_DISINFECT:
                 setHeatNelsonSupportMode( nelson );
                 requestNewOperationMode( DG_MODE_HEAT );
+                break;
 
             case NELSON_CHEM_DISINFECT:
                 setChemNelsonSupportMode( nelson );