Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -re4131199548581bbdb3555441ce8f6328c45079b -rd4bc221d9817b488c2dcd00868386d7036a5c9a1
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision e4131199548581bbdb3555441ce8f6328c45079b)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision d4bc221d9817b488c2dcd00868386d7036a5c9a1)
@@ -7,8 +7,8 @@
 *
 * @file    Dialysis.c
 *
-* @author  (last)      Darren Cox
-* @date    (last)      16-Aug-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      25-Aug-2022
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -1264,20 +1264,25 @@
     loadCellBackupWeight  = getReservoirBackupWeightLargeFilter( reservoirID );
     loadCellCurrentDrift  = loadCellPrimaryWeight - loadCellBackupWeight;
 
-    if ( ( RESERVOIR_STEADY_CYCLE_FINAL == cycle ) && ( lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] > (LOAD_CELL_ILLEGAL_WEIGHT_VALUE + 1) ) )
+    if ( ( RESERVOIR_STEADY_CYCLE_FINAL == cycle ) && ( lcLastSteadyWeight[ RESERVOIR_STEADY_CYCLE_START ][ lcPrimaryIndex ] > ( LOAD_CELL_ILLEGAL_WEIGHT_VALUE + 1 ) ) )
     {
         // Start Weight has been previously saved, ok to test
-        loadCellPreviousDrift = lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] - lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcBackupIndex];
+        loadCellPreviousDrift = lcLastSteadyWeight[ RESERVOIR_STEADY_CYCLE_START ][ lcPrimaryIndex ] - lcLastSteadyWeight[ RESERVOIR_STEADY_CYCLE_START ][ lcBackupIndex ];
         driftDiff = fabs ( loadCellCurrentDrift - loadCellPreviousDrift );
     }
     // Save latest reading for next test time
-    lcLastSteadyWeight[cycle][lcPrimaryIndex] = loadCellPrimaryWeight;
-    lcLastSteadyWeight[cycle][lcBackupIndex]  = loadCellBackupWeight;
+    lcLastSteadyWeight[ cycle ][ lcPrimaryIndex ] = loadCellPrimaryWeight;
+    lcLastSteadyWeight[ cycle ][ lcBackupIndex ]  = loadCellBackupWeight;
 
-    // Check for drift out of range
-    if ( driftDiff > LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, loadCellCurrentDrift, loadCellPreviousDrift )
+        // Check for drift out of range
+        if ( driftDiff > LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, loadCellCurrentDrift, loadCellPreviousDrift )
+        }
     }
 }