Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r044d8892373acc5545020aab894cd1943c4d7449 -r231665843bcb057cab17d967fa1543d94a66c9df
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 044d8892373acc5545020aab894cd1943c4d7449)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 231665843bcb057cab17d967fa1543d94a66c9df)
@@ -235,7 +235,7 @@
 void execDGInterfaceMonitor( void )
 {
     // Trigger alarm if not receiving new load cell data message in timely manner
-    checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag );
+    /*checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag );
 
     // Trigger alarm if not receiving new dialysate temperature data message in timely manner
     checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMPERATURE_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag );
@@ -246,7 +246,7 @@
     // Trigger alarm if not receiving new DG op mode message in timely manner
     checkDGDataFreshness( ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
 
-    // Check to see if DG has restarted
+    // Check to see if DG has restarted*/
     checkDGRestart();
 
     // Check the status of the trimmer heater
@@ -452,26 +452,26 @@
 
 /*********************************************************************//**
  * @brief
- * The getDialysateTemperature function gets the latest dialysate temperature.
- * @details Inputs: dgDialysateTemp
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
  * @details Outputs: none
- * @return the current dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
  * @brief
- * The getDGDisinfectsStates function returns the DG disinfects readings.
- * @details Inputs: none
+ * The getDialysateTemperature function gets the latest dialysate temperature.
+ * @details Inputs: dgDialysateTemp
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the current dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r726c340ed2bdedd8532a2ee26422e1b70643397f -r231665843bcb057cab17d967fa1543d94a66c9df
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 726c340ed2bdedd8532a2ee26422e1b70643397f)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 231665843bcb057cab17d967fa1543d94a66c9df)
@@ -74,6 +74,7 @@
 
 /// Persist time (task intervals) for flow vs. motor speed error condition.
 static const U32 DIP_FLOW_VS_SPEED_PERSIST     = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+//static const U32 DIP_FLOW_VS_SPEED_PERSIST     = ((60 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);   //DN-03NOV2022 - Make it 1 minutes for testing
 /// Persist time (task intervals) for motor off error condition.
 static const U32 DIP_OFF_ERROR_PERSIST         = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
 /// Persist time (task intervals) motor speed error condition.
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r044d8892373acc5545020aab894cd1943c4d7449 -r231665843bcb057cab17d967fa1543d94a66c9df
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 044d8892373acc5545020aab894cd1943c4d7449)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 231665843bcb057cab17d967fa1543d94a66c9df)
@@ -629,8 +629,7 @@
 
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
-    //setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( 250, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); // TODO remove this line once the new flow control is implemented
+    setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     cmdStartDGTrimmerHeater();
 }
 
@@ -1177,6 +1176,7 @@
                     rsrvrCmd.reservoirID                     = (U32)DG_RESERVOIR_1;
                     rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
                     reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
+
                     cmdSetDGActiveReservoir( &rsrvrCmd );
                 }
             }
@@ -1187,6 +1187,7 @@
                 rsrvrCmd.reservoirID                     = (U32)DG_RESERVOIR_2;
                 rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
                 reservoirFlushedStatus[ DG_RESERVOIR_2 ] = TRUE;
+
                 cmdSetDGActiveReservoir( &rsrvrCmd );
             }
         }
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r044d8892373acc5545020aab894cd1943c4d7449 -r231665843bcb057cab17d967fa1543d94a66c9df
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 044d8892373acc5545020aab894cd1943c4d7449)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 231665843bcb057cab17d967fa1543d94a66c9df)
@@ -66,6 +66,7 @@
 static OVERRIDE_U32_T standbyModePublishInterval = { DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, 0 };
 
 static const U32 SERVICE_TIME_INTERVAL_S = (U32)( 365 * 0.5 * SECONDS_IN_A_DAY );              ///< HD/DG 6-month service interval in seconds.
+static BOOL homingInitiated;                                                                   ///< Flag indicates actuator homing has been initiated from standby mode.
 
 // ********** private function prototypes **********
 
@@ -109,6 +110,7 @@
     heatDisinfectStartReqReceived = FALSE;
     chemDisinfectStartReqReceived = FALSE;
     disinfectCancelReqID          = GENERIC_CONFIRM_ID_NONE;
+    homingInitiated               = FALSE;
     dgDisinfectState              = DG_DISINFECT_NOT_RUNNING_STATE;
     homingInitiated               = FALSE;
 }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r044d8892373acc5545020aab894cd1943c4d7449 -r231665843bcb057cab17d967fa1543d94a66c9df
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 044d8892373acc5545020aab894cd1943c4d7449)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 231665843bcb057cab17d967fa1543d94a66c9df)
@@ -900,7 +900,7 @@
                 U16 msgID;
 
                 memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }
         }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r044d8892373acc5545020aab894cd1943c4d7449 -r231665843bcb057cab17d967fa1543d94a66c9df
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 044d8892373acc5545020aab894cd1943c4d7449)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 231665843bcb057cab17d967fa1543d94a66c9df)
@@ -5251,6 +5251,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingPercentOverride( payload.state.f32 );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r044d8892373acc5545020aab894cd1943c4d7449 -r231665843bcb057cab17d967fa1543d94a66c9df
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 044d8892373acc5545020aab894cd1943c4d7449)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 231665843bcb057cab17d967fa1543d94a66c9df)
@@ -833,9 +833,6 @@
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
 BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response );
 
-// MSG_ID_HD_SEND_ALARMS_COMMAND
-void handleResendAllAlarmsCommand(  MESSAGE_T* message );
-
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );