Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r403a5ac7320f57617ef6fdaf71756ca139cd3b02 -re5006f5263e8540e730dd802016fef5973ecea4c
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 403a5ac7320f57617ef6fdaf71756ca139cd3b02)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision e5006f5263e8540e730dd802016fef5973ecea4c)
@@ -910,27 +910,30 @@
 
     BOOL const dialysateTempRecovered = fabs( dgDialysateTemp - dgTrimmerTempSet ) < DIALYSATE_TEMP_RECOVERY_TOLERANCE_C ? TRUE : FALSE;
 
-#ifndef DISABLE_DIALYSATE_TEMP_CHECK
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dgTrimmerTempSet, dgDialysateTemp );
-    }
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dgTrimmerTempSet, dgDialysateTemp );
+        }
 
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateLowTemp ) )
-    {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dgTrimmerTempSet, dgDialysateTemp );
-    }
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateLowTemp ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dgTrimmerTempSet, dgDialysateTemp );
+        }
 
-    if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
-    {
-        clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH );
-    }
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
+        {
+            clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH );
+        }
 
-    if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateTempRecovered ) )
-    {
-        clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_LOW );
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateTempRecovered ) )
+        {
+            clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_LOW );
+        }
     }
-#endif
 }
 
 // ********** private functions **********