Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r81769c6bea6ed32d70698fb03ad5823de1814b27 -rf0487091f8a986c03e0152e12610b87363b356c9
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 81769c6bea6ed32d70698fb03ad5823de1814b27)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision f0487091f8a986c03e0152e12610b87363b356c9)
@@ -693,8 +693,8 @@
 
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE != getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) )
-    {
 #endif
+    {
         if ( cd2Conductivity < MIN_PRIME_ACID_CONDUCTIVITY_US_PER_CM )
         {
             primeAcidSteadyStateCounter = 0;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -rf0487091f8a986c03e0152e12610b87363b356c9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision eceb190a5d66fdbee779478ac8bb50a846ed9241)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f0487091f8a986c03e0152e12610b87363b356c9)
@@ -29,6 +29,7 @@
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeChemicalDisinfect.h"
+#include "ModeChemicalDisinfectFlush.h"
 #include "ModeFill.h"
 #include "ModeFlush.h"
 #include "ModeGenIdle.h"