Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r15f9827c863812cfd1f891d22342103fe9a72abc -re5006f5263e8540e730dd802016fef5973ecea4c
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision e5006f5263e8540e730dd802016fef5973ecea4c)
@@ -1040,9 +1040,12 @@
     // Check UF rate over last hour
     if ( uFMeasRate > MAX_UF_RATE_ML_PER_HOUR )
     {
-#ifndef DISABLE_UF_ALARMS
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_UF_RATE_TOO_HIGH_ERROR, uFMeasRate );
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+        {
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_UF_RATE_TOO_HIGH_ERROR, uFMeasRate );
+        }
     }
     // Increment timer and see if time to start another 1 hour check period
     if ( ++uFAccuracyCheckTimerCtr >= UF_ACCURACY_CHECK_INTERVAL )
@@ -1055,9 +1058,12 @@
     // Check total UF volume error
     if ( ( fabs( refUFVolume - measUFVolume ) ) >= (F32)MAX_UF_ACCURACY_ERROR_ML )
     {
-#ifndef DISABLE_UF_ALARMS
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_UF_VOLUME_ACCURACY_ERROR, refUFVolume, measUFVolume );
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_UF_VOLUME_ACCURACY_ERROR, refUFVolume, measUFVolume );
+        }
     }
 }
 
@@ -1076,17 +1082,21 @@
     DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
     LOAD_CELL_ID_T loadCell = ( activeRes == DG_RESERVOIR_1 ? LOAD_CELL_RESERVOIR_1_PRIMARY : LOAD_CELL_RESERVOIR_2_PRIMARY );
     F32 latestResVolume = getLoadCellWeight( loadCell );
-#ifndef DISABLE_UF_ALARMS
     F32 deltaVolume = latestResVolume - resLastVolume[ activeRes ];
 
     // ensure volume change is not too excessive - indication that load cell was impacted by some kind of shock
     if ( fabs(deltaVolume) > MAX_ACTIVE_LOAD_CELL_CHANGE_G )
     {
-        ALARM_ID_T deltaAlarm = ( getDGActiveReservoir() == DG_RESERVOIR_1 ? ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM : ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM );
-        SET_ALARM_WITH_1_F32_DATA( deltaAlarm, deltaVolume );
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+        {
+            ALARM_ID_T deltaAlarm = ( getDGActiveReservoir() == DG_RESERVOIR_1 ? ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM :
+                                                                                 ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM );
+            SET_ALARM_WITH_1_F32_DATA( deltaAlarm, deltaVolume );
+        }
     }
     else
-#endif
     {
         // Calculate UF volumes and provide to dialysate outlet pump controller
         measUFVolume = measUFVolumeFromPriorReservoirs + ( latestResVolume - resStartVolume[ activeRes ] );