Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rffaf9f13166d7a9beb4252fad804c488f870aaaa -r14608b20a408cb5d1dddf6e3daaa8b995096b87d
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision ffaf9f13166d7a9beb4252fad804c488f870aaaa)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 14608b20a408cb5d1dddf6e3daaa8b995096b87d)
@@ -96,8 +96,8 @@
 static BOOL dgOpModeDataFreshFlag = FALSE;                                  ///< Flag to signal the handleDGOpMode() to process fresh dg op mode data
 
 // Reservoir data
-static DG_RESERVOIR_ID_T dgActiveReservoir = DG_RESERVOIR_2;                ///< Latest active reservoir reported by the DG.
-static DG_RESERVOIR_ID_T dgActiveReservoirSet = DG_RESERVOIR_2;             ///< Active reservoir commanded.
+static DG_RESERVOIR_ID_T dgActiveReservoir;                                 ///< Latest active reservoir reported by the DG.
+static DG_RESERVOIR_ID_T dgActiveReservoirSet;                              ///< Active reservoir commanded.
 
 static U32 dgReservoirFillVolumeTarget = 0;                                 ///< Latest fill-to volume reported by the DG.
 static U32 dgReservoirFillVolumeTargetSet = 0;                              ///< Fill-to volume commanded.
@@ -129,12 +129,13 @@
 {
     U32 i, j;
 
+    // NOTE: the active reservoir is set to reservoir 1 since DG will send active reservoir 1 as active on power up
     dgStarted                       = FALSE;
     dgTrimmerHeaterOn               = FALSE;
     dgTrimmerTempSet                = 0.0F;
     dgTrimmerTempCheckTimerCtr      = 0;
-    dgActiveReservoirSet            = DG_RESERVOIR_2;
-    dgActiveReservoir               = DG_RESERVOIR_2;
+    dgActiveReservoirSet            = DG_RESERVOIR_1;
+    dgActiveReservoir               = DG_RESERVOIR_1;
     dgReservoirFillVolumeTargetSet  = 0;
     dgReservoirDrainVolumeTargetSet = 0;
     dgDialysateTemp                 = 0.0F;
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r85d63f6506792d01f739f9e50c520778615495bd -r14608b20a408cb5d1dddf6e3daaa8b995096b87d
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 85d63f6506792d01f739f9e50c520778615495bd)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 14608b20a408cb5d1dddf6e3daaa8b995096b87d)
@@ -816,6 +816,7 @@
     if ( TRUE == resumeTreatmentAlarmResponseRequest )
     {
         resumeTreatmentAlarmResponseRequest = FALSE;
+        // Hard stop the pumps when recovering from the treatment stop to not start from a high speed
         signalDialInPumpHardStop();
         signalDialOutPumpHardStop();