Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -raeb1dea9ea10fcc70ae66023a87b565f29924c07 -rdaaf76c5b69282cb044896b7722c73ac7c89f1a1
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision aeb1dea9ea10fcc70ae66023a87b565f29924c07)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision daaf76c5b69282cb044896b7722c73ac7c89f1a1)
@@ -653,28 +653,27 @@
  *************************************************************************/
 void setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup )
 {
+    DG_RESERVOIR_ID_T res;
+
     loadCellWeightInGrams[ LOAD_CELL_RESERVOIR_1_PRIMARY ].data = res1Primary;
     loadCellWeightInGrams[ LOAD_CELL_RESERVOIR_1_BACKUP ].data = res1Backup;
     loadCellWeightInGrams[ LOAD_CELL_RESERVOIR_2_PRIMARY ].data = res2Primary;
     loadCellWeightInGrams[ LOAD_CELL_RESERVOIR_2_BACKUP ].data = res2Backup;
 
     // feed new weight samples into filters and update moving averages
-    smLoadCellReadingsTotal[ DG_RESERVOIR_1 ] -= smLoadCellReadings[ DG_RESERVOIR_1 ][ smLoadCellReadingsIdx ];
-    lgLoadCellReadingsTotal[ DG_RESERVOIR_1 ] -= lgLoadCellReadings[ DG_RESERVOIR_1 ][ lgLoadCellReadingsIdx ];
-    smLoadCellReadingsTotal[ DG_RESERVOIR_2 ] -= smLoadCellReadings[ DG_RESERVOIR_2 ][ smLoadCellReadingsIdx ];
-    lgLoadCellReadingsTotal[ DG_RESERVOIR_2 ] -= lgLoadCellReadings[ DG_RESERVOIR_2 ][ lgLoadCellReadingsIdx ];
-    smLoadCellReadings[ DG_RESERVOIR_1 ][ smLoadCellReadingsIdx ] = res1Primary;
-    lgLoadCellReadings[ DG_RESERVOIR_1 ][ lgLoadCellReadingsIdx ] = res1Primary;
-    smLoadCellReadings[ DG_RESERVOIR_2 ][ smLoadCellReadingsIdx ] = res2Primary;
-    lgLoadCellReadings[ DG_RESERVOIR_2 ][ lgLoadCellReadingsIdx ] = res2Primary;
-    smLoadCellReadingsTotal[ DG_RESERVOIR_1 ] += res1Primary;
-    lgLoadCellReadingsTotal[ DG_RESERVOIR_1 ] += res1Primary;
-    smLoadCellReadingsTotal[ DG_RESERVOIR_2 ] += res2Primary;
-    lgLoadCellReadingsTotal[ DG_RESERVOIR_2 ] += res2Primary;
-    smFilteredReservoirWeightInGrams[ DG_RESERVOIR_1 ] = smLoadCellReadingsTotal[ DG_RESERVOIR_1 ] / (F32)SIZE_OF_SMALL_LOAD_CELL_AVG;
-    lgFilteredReservoirWeightInGrams[ DG_RESERVOIR_1 ] = lgLoadCellReadingsTotal[ DG_RESERVOIR_1 ] / (F32)SIZE_OF_LARGE_LOAD_CELL_AVG;
-    smFilteredReservoirWeightInGrams[ DG_RESERVOIR_2 ] = smLoadCellReadingsTotal[ DG_RESERVOIR_2 ] / (F32)SIZE_OF_SMALL_LOAD_CELL_AVG;
-    lgFilteredReservoirWeightInGrams[ DG_RESERVOIR_2 ] = lgLoadCellReadingsTotal[ DG_RESERVOIR_2 ] / (F32)SIZE_OF_LARGE_LOAD_CELL_AVG;
+    for ( res = DG_RESERVOIR_1; res < NUM_OF_DG_RESERVOIRS; res++ )
+    {
+        F32 wt = ( res == DG_RESERVOIR_1 ? res1Primary : res2Primary );
+
+        smLoadCellReadingsTotal[ res ] -= smLoadCellReadings[ res ][ smLoadCellReadingsIdx ];
+        lgLoadCellReadingsTotal[ res ] -= lgLoadCellReadings[ res ][ lgLoadCellReadingsIdx ];
+        smLoadCellReadings[ res ][ smLoadCellReadingsIdx ] = wt;
+        lgLoadCellReadings[ res ][ lgLoadCellReadingsIdx ] = wt;
+        smLoadCellReadingsTotal[ res ] += wt;
+        lgLoadCellReadingsTotal[ res ] += wt;
+        smFilteredReservoirWeightInGrams[ res ] = smLoadCellReadingsTotal[ res ] / (F32)SIZE_OF_SMALL_LOAD_CELL_AVG;
+        lgFilteredReservoirWeightInGrams[ res ] = lgLoadCellReadingsTotal[ res ] / (F32)SIZE_OF_LARGE_LOAD_CELL_AVG;
+    }
     smLoadCellReadingsIdx = INC_WRAP( smLoadCellReadingsIdx, 0, SIZE_OF_SMALL_LOAD_CELL_AVG - 1 );
     lgLoadCellReadingsIdx = INC_WRAP( lgLoadCellReadingsIdx, 0, SIZE_OF_LARGE_LOAD_CELL_AVG - 1 );
 }
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -ref95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6 -rdaaf76c5b69282cb044896b7722c73ac7c89f1a1
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision ef95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision daaf76c5b69282cb044896b7722c73ac7c89f1a1)
@@ -656,17 +656,10 @@
             noRinseback = ( TRUE == ALARM_TABLE[ a ].alarmNoRinseback ? TRUE : noRinseback );
             noEndTreatment = ( TRUE == ALARM_TABLE[ a ].alarmNoEndTreatment ? TRUE : noEndTreatment );
             noNewTreatment = ( TRUE == ALARM_TABLE[ a ].alarmNoNewTreatment ? TRUE : noNewTreatment );
-            bypassDialyzer = ( TRUE == ALARM_TABLE[ a ].alarmDialyzerBypass ? TRUE : bypassDialyzer );
 
         } // if alarm active
     } // alarm table loop
 
-    // do not bypass dialyzer if stop or fault flag set
-    if ( ( TRUE == systemFault ) || ( TRUE == stop ) )
-    {
-        bypassDialyzer = FALSE;
-    }
-
     // set updated alarm flags
     alarmStatus.systemFault = systemFault;
     alarmStatus.stop = stop;
Index: firmware/App/Services/PIControllers.c
===================================================================
diff -u -r0ca8364b86f7b7d7841bc884eae5f674fd5618d4 -rdaaf76c5b69282cb044896b7722c73ac7c89f1a1
--- firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision 0ca8364b86f7b7d7841bc884eae5f674fd5618d4)
+++ firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision daaf76c5b69282cb044896b7722c73ac7c89f1a1)
@@ -34,7 +34,7 @@
 typedef enum controller_Directions
 {
     CONTROLLER_BIDIRECTIONAL = 0,           ///< Controller runs bidirectional so it covers positive and negative control signals
-    CONTROLLER_UNIDIRECTIONAL,              ///< Controller run unidirectional so it only covers positive control signals
+    CONTROLLER_UNIDIRECTIONAL,              ///< Controller runs unidirectional so it only covers positive control signals
     NUM_OF_CONTROLLELR_DIRECTIONS           ///< Number of PI controllers directions
 } PI_CONTROLLER_DIRECTIONS_T;
 
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -rdaaf76c5b69282cb044896b7722c73ac7c89f1a1
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision daaf76c5b69282cb044896b7722c73ac7c89f1a1)
@@ -1253,10 +1253,6 @@
                 handleTestBloodFlowBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE:
-                handleTestAlarmStatusBroadcastIntervalOverrideRequest( message );
-                break;
-
             case MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE:
                 handleTestBloodPumpMeasuredSpeedOverrideRequest( message );
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -raeb1dea9ea10fcc70ae66023a87b565f29924c07 -rdaaf76c5b69282cb044896b7722c73ac7c89f1a1
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision aeb1dea9ea10fcc70ae66023a87b565f29924c07)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision daaf76c5b69282cb044896b7722c73ac7c89f1a1)
@@ -2272,38 +2272,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestAlarmStatusBroadcastIntervalOverrideRequest function handles a request to
- * override the broadcast interval for alarm status.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestAlarmStatusBroadcastIntervalOverrideRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetAlarmStatusPublishIntervalOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetAlarmStatusPublishIntervalOverride();
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestBloodFlowSetPointOverrideRequest function handles a request to
  * override the set point for the blood flow rate (mL/min).
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -rdaaf76c5b69282cb044896b7722c73ac7c89f1a1
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision daaf76c5b69282cb044896b7722c73ac7c89f1a1)
@@ -259,9 +259,6 @@
 // MSG_ID_ALARM_TIME_OVERRIDE
 void handleTestAlarmTimeOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE
-void handleTestAlarmStatusBroadcastIntervalOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE
 void handleTestBloodFlowSetPointOverrideRequest( MESSAGE_T *message );