Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rdb291cc22fd8f10e6e47cad468e14ed5590a94f2 -ra3f4042b73d09dd6dac075937878685f26053c0a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision db291cc22fd8f10e6e47cad468e14ed5590a94f2)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision a3f4042b73d09dd6dac075937878685f26053c0a)
@@ -143,7 +143,6 @@
 static PRE_TREATMENT_RESERVOIR_MGMT_STATE_T handlePreTreatmentReservoirMgmtWaitReservoirSwitchState( void );
 static void handlePreTreatmentReservoirMgmtCompleteState( void );
 static U32 getPreTreatmentFillVolume( DG_RESERVOIR_ID_T inactiveRes );
-static void setPreTreatmentHeatingParams( F32 targetTempC, U32 targetVolML, F32 targetFillFlowLPM, U32 dialysateFlowMLPM );
 
 // Test configuration test function and final drain correction at patient connect
 static void execPreTreatmentTestConfigReservoirMgmt( void );
@@ -613,6 +612,32 @@
 
 /*********************************************************************//**
  * @brief
+ * The setPreTreatmentHeatingParams function calculates and set the heating
+ * parameters to be sent to DG.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @param targetTempC target temperature in C
+ * @param targetVolML target fill volume in milliliters
+ * @param targetFillFlowLPM target fill flow rate in L/min
+ * @param dialysateFlowMLPM dialysate flow in mL/min
+ * @return none
+ *************************************************************************/
+void setPreTreatmentHeatingParams( F32 targetTempC, U32 targetVolML, F32 targetFillFlowLPM, U32 dialysateFlowMLPM )
+{
+    DG_CMD_DIALYSATE_HEATING_PARAMS_T params;
+    F32 fillTimeMS = ( (F32)targetVolML / ( targetFillFlowLPM * ML_PER_LITER ) ) * SEC_PER_MIN * MS_PER_SECOND;
+
+    params.trimmerTargetTemperature   = targetTempC;
+    params.timeReservoirWait2SwitchMS = 0;
+    params.timeReservoirFillMS        = fillTimeMS;
+    params.timeReservoirCycleMS       = (U32)fillTimeMS;
+    params.dialysateFlowLPM           = ( (F32)dialysateFlowMLPM ) / ML_PER_LITER;
+    params.usePriTargetTempEquation   = FALSE;
+    cmdSetDGDialysateHeatingParams( params );
+}
+
+/*********************************************************************//**
+ * @brief
  * The publishPreTreatmentState function broadcasts pre-treatment sub-mode
  * and current sub-mode state.
  * @details Inputs: pre-treatment sub-mode, state
@@ -1622,32 +1647,6 @@
      return volume;
 }
 
-/*********************************************************************//**
- * @brief
- * The setPreTreatmentHeatingParams function calculates and set the heating
- * parameters to be sent to DG.
- * @details Inputs: none
- * @details Outputs: none
- * @param targetTempC target temperature in C
- * @param targetVolML target fill volume in milliliters
- * @param targetFillFlowLPM target fill flow rate in L/min
- * @param dialysateFlowMLPM dialysate flow in mL/min
- * @return none
- *************************************************************************/
-static void setPreTreatmentHeatingParams( F32 targetTempC, U32 targetVolML, F32 targetFillFlowLPM, U32 dialysateFlowMLPM )
-{
-    DG_CMD_DIALYSATE_HEATING_PARAMS_T params;
-    F32 fillTimeMS = ( (F32)targetVolML / ( targetFillFlowLPM * ML_PER_LITER ) ) * SEC_PER_MIN * MS_PER_SECOND;
-
-    params.trimmerTargetTemperature   = targetTempC;
-    params.timeReservoirWait2SwitchMS = 0;
-    params.timeReservoirFillMS        = fillTimeMS;
-    params.timeReservoirCycleMS       = (U32)fillTimeMS;
-    params.dialysateFlowLPM           = ( (F32)dialysateFlowMLPM ) / ML_PER_LITER;
-    params.usePriTargetTempEquation   = FALSE;
-    cmdSetDGDialysateHeatingParams( params );
-}
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
Index: firmware/App/Modes/ModePreTreat.h
===================================================================
diff -u -rdb291cc22fd8f10e6e47cad468e14ed5590a94f2 -ra3f4042b73d09dd6dac075937878685f26053c0a
--- firmware/App/Modes/ModePreTreat.h	(.../ModePreTreat.h)	(revision db291cc22fd8f10e6e47cad468e14ed5590a94f2)
+++ firmware/App/Modes/ModePreTreat.h	(.../ModePreTreat.h)	(revision a3f4042b73d09dd6dac075937878685f26053c0a)
@@ -63,6 +63,9 @@
 void signalAllowDGFillRes1( void );                                 // Signal that indicates the HD may begin filling reservoir 1 (after flushes completed)
 void signalAllowDGFillRes2( void );                                 // Signal that indicates the HD may begin filling reservoir 2 (after flushes completed)
 
+// Set the trimmer heating parameters
+void setPreTreatmentHeatingParams( F32 targetTempC, U32 targetVolML, F32 targetFillFlowLPM, U32 dialysateFlowMLPM );
+
 void signalAlarmActionToPreTreatmentMode( ALARM_ACTION_T action );  // Execute alarm action as appropriate for pre-treatment mode
 
 BOOL getReservoirFillStatus( DG_RESERVOIR_ID_T reservoirID );       // Get the fill complete status for given reservoir
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r3c0614e16047ada1ea30c9e7f883f78d98b363e3 -ra3f4042b73d09dd6dac075937878685f26053c0a
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 3c0614e16047ada1ea30c9e7f883f78d98b363e3)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision a3f4042b73d09dd6dac075937878685f26053c0a)
@@ -45,6 +45,7 @@
 #define DEFAULT_RINSEBACK_FLOW_RATE_ML_MIN          200                     ///< Default rinseback flow rate (in mL/min).
 #define MIN_RINSEBACK_FLOW_RATE_ML_MIN              100                     ///< Minimum rinseback flow rate (in mL/min).
 #define MAX_RINSEBACK_FLOW_RATE_ML_MIN              300                     ///< Maximum rinseback flow rate (in mL/min).
+#define DEFAULT_FILL_RESERVOIR_TO_VOLUME_ML         1500                    ///< default Fill reservoir to this volume (in mL).
 
 /// Interval at which rinseback progress is to be published to UI.
 #define RINSEBACK_DATA_PUBLISH_INTERVAL             ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
@@ -188,6 +189,20 @@
     stopSyringePump();
     endAirTrapControl();
 
+    // If DG restarted for some reason, lets make sure we set the heating parameters first before commanding to
+    // turn on the trimmer heater and start the DG as well.
+    if ( DG_MODE_STAN == getDGOpMode() )
+    {
+        F32 targetTempC       = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
+        U32 dialysateFlowMLPM = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW );
+
+        // Set the heating parameters
+        setPreTreatmentHeatingParams( targetTempC, DEFAULT_FILL_RESERVOIR_TO_VOLUME_ML, DEFAULT_TARGET_FILL_FLOW_RATE_LPM, dialysateFlowMLPM );
+
+        // Start the DG
+        cmdStartDG();
+    }
+
     // Re-circulate dialysate side of dialyzer w/ heating to maintain temperature
     setDialInPumpTargetFlowRate( DIALYSATE_FLOW_RATE_FOR_RECIRC, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     cmdStartDGTrimmerHeater();
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r3c0614e16047ada1ea30c9e7f883f78d98b363e3 -ra3f4042b73d09dd6dac075937878685f26053c0a
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 3c0614e16047ada1ea30c9e7f883f78d98b363e3)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a3f4042b73d09dd6dac075937878685f26053c0a)
@@ -377,7 +377,8 @@
         // if the block timer is 0 OR we have an unblockable alarm
         if (   ( ALARM_NOT_BLOCKED == alarmsBlockedTimer )
                 || ( ALARM_ID_HD_AC_POWER_LOST == alarm )
-                || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm ) )
+                || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm )
+                || ( ALARM_ID_HD_DG_RESTARTED_FAULT == alarm ) )
         {   // do not re-trigger alarm if blocked by property
             if ( ( FALSE == alarmNoRetrigger ) ||
                  ( ( ALARM_TABLE[ alarm ].alarmNoRetrigOnRB != TRUE ) && ( ALARM_TABLE[ alarm ].alarmNoRetrigOnEndTx != TRUE ) ) )