Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rb1b5e8659de8f6109c4d77cda98308d1fd9ef165 -re6dc73b45ec3d0df4c9a03673625862b71acd608
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision b1b5e8659de8f6109c4d77cda98308d1fd9ef165)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e6dc73b45ec3d0df4c9a03673625862b71acd608)
@@ -196,8 +196,10 @@
     BOOL const isCondTooHigh = ( conductivity > COND_SENSOR_CPI_MAX_VALUE );
     BOOL const isCondTooLow = ( conductivity < COND_SENSOR_CPI_MIN_VALUE );
 
+#ifndef DISABLE_WATER_QUALITY_CHECK
     checkPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, isCondTooHigh, conductivity, COND_SENSOR_CPI_MAX_VALUE );
     checkPersistentAlarm( ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, isCondTooLow, conductivity, COND_SENSOR_CPI_MIN_VALUE );
+#endif
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r484b185f0cf4b2ea0ba9de331573952b1b5124b4 -re6dc73b45ec3d0df4c9a03673625862b71acd608
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 484b185f0cf4b2ea0ba9de331573952b1b5124b4)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision e6dc73b45ec3d0df4c9a03673625862b71acd608)
@@ -242,10 +242,12 @@
  *************************************************************************/
 void checkInletPressure( void )
 {
+#ifndef DISABLE_WATER_QUALITY_CHECK
     F32 const pressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
     BOOL const isPressureTooLow = ( pressure < MIN_INLET_WATER_PRESSURE );
 
     checkPersistentAlarm( ALARM_ID_INLET_WATER_LOW_PRESSURE, isPressureTooLow, pressure, MIN_INLET_WATER_PRESSURE );
+#endif
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rb1dc3df084a8517ca1575bdbf741fecd96d56a12 -re6dc73b45ec3d0df4c9a03673625862b71acd608
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision b1dc3df084a8517ca1575bdbf741fecd96d56a12)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision e6dc73b45ec3d0df4c9a03673625862b71acd608)
@@ -333,12 +333,14 @@
  *************************************************************************/
 void checkInletWaterTemperature( void )
 {
+#ifndef DISABLE_WATER_QUALITY_CHECK
     F32 const temperature = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
     BOOL const isWaterTempTooHigh = temperature > MAX_WATER_INPUT_TEMPERATURE;
     BOOL const isWaterTempTooLow = temperature < MIN_WATER_INPUT_TEMPERATURE;
 
     checkPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, isWaterTempTooHigh, temperature, MAX_WATER_INPUT_TEMPERATURE );
     checkPersistentAlarm( ALARM_ID_INLET_WATER_LOW_TEMPERATURE, isWaterTempTooLow, temperature, MIN_WATER_INPUT_TEMPERATURE );
+#endif
 }
 
 /*********************************************************************//**
Index: firmware/App/DGCommon.h
===================================================================
diff -u -rb1b5e8659de8f6109c4d77cda98308d1fd9ef165 -re6dc73b45ec3d0df4c9a03673625862b71acd608
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision b1b5e8659de8f6109c4d77cda98308d1fd9ef165)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision e6dc73b45ec3d0df4c9a03673625862b71acd608)
@@ -46,6 +46,9 @@
     #define DISABLE_DIALYSATE_CHECK         1
     #define DISABLE_RO_RATIO_CHECK          1
     #define DISABLE_COND_SENSOR_CHECK       1
+    #define DISABLE_MIXING                  1
+    #define DISABLE_WATER_QUALITY_CHECK     1
+
     #include <stdio.h>
     #include <strings.h>
 #endif
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rb1b5e8659de8f6109c4d77cda98308d1fd9ef165 -re6dc73b45ec3d0df4c9a03673625862b71acd608
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b1b5e8659de8f6109c4d77cda98308d1fd9ef165)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e6dc73b45ec3d0df4c9a03673625862b71acd608)
@@ -384,7 +384,9 @@
 
         if ( integratedVolumeToLoadCellReadingPercent > FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE )
         {
+#ifndef DISABLE_MIXING
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, filledVolume_mL, integratedVolume_mL );
+#endif
         }
 
         requestNewOperationMode( DG_MODE_CIRC );
@@ -403,13 +405,15 @@
  *************************************************************************/
 static void handleDialysateMixing( void )
 {
+#ifndef DISABLE_MIXING
     // Set concentrate pumps speed based off RO pump flow rate
     F32 const measuredROFlowRate = getMeasuredROFlowRate();
     F32 const acidCP1PumpFlowRate = DIALYSATE_ACID_CONCENTRATE_RATIO * measuredROFlowRate * ML_PER_LITER;
     F32 const bicarbCP2PumpFlowRate = DIALYSATE_BICARB_CONCENTRATE_RATIO * measuredROFlowRate * ML_PER_LITER;
 
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, acidCP1PumpFlowRate );
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, bicarbCP2PumpFlowRate );
+#endif
 }
 
 /**@}*/