Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r688bd3abbe26cdde15368c8769511d8cf152a721 -r70654c8e042da0dd7ee7dc37c21bd8f4d54544e7
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 688bd3abbe26cdde15368c8769511d8cf152a721)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 70654c8e042da0dd7ee7dc37c21bd8f4d54544e7)
@@ -88,7 +88,7 @@
 static HD_STANDBY_STATE_T handleStandbyModeDGCleaningModeInProgressState( void );
 
 static void handleDisinfectCancel( BOOL stop );
-static void setRequestedCleaningMode( DG_OP_MODE_T opMode, BOOL isNocturnalHeatDis );
+static void setRequestedCleaningMode( DG_OP_MODE_T opMode, BOOL isHeatDisPassiveCool );
 static void clearCurrentCleaningModeStatus( void );
 static void handleChemFlushSampleCollection( void );
 static void handleROPermeateSampleCollection( void );
@@ -392,13 +392,13 @@
 
 /*********************************************************************//**
  * @brief
- * The signalUserInitiateFlushMode function handles user initiation of heat
- * disinfect mode.
+ * The signalUserInitiateHeatDisinfectActiveCoolMode function handles user
+ * initiation of heat disinfect with active cool mode.
  * @details Inputs: currentStandbyState
  * @details Outputs: currentStandbyState
  * @return TRUE if signal accepted, FALSE if not
  *************************************************************************/
-BOOL signalUserInitiateHeatDisinfectMode( void )
+BOOL signalUserInitiateHeatDisinfectActiveCoolMode( void )
 {
     BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
@@ -550,13 +550,13 @@
 
 /*********************************************************************//**
  * @brief
- * The signalUserInitiateNocturnalHeatDisinfectMode function handles user
- * initiation of nocturnal heat disinfect mode.
+ * The signalUserInitiateHeatDisinfectPassiveCoolMode function handles user
+ * initiation of passive cool heat disinfect mode.
  * @details Inputs: currentStandbyState
  * @details Outputs: currentStandbyState
  * @return TRUE if signal accepted, FALSE if not
  *************************************************************************/
-BOOL signalUserInitiateNocturnalHeatDisinfectMode( void )
+BOOL signalUserInitiateHeatDisinfectPassiveCoolMode( void )
 {
     BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
@@ -586,13 +586,13 @@
 
 /*********************************************************************//**
  * @brief
- * The signalUserInitiateHeatDisinfectActiveCoolMode function handles user
- * initiation of heat disinfect active cool mode.
+ * The signalUserInitiateActiveCoolMode function handles user initiation of
+ * active cool mode.
  * @details Inputs: currentStandbyState
  * @details Outputs: currentStandbyState
  * @return TRUE if signal accepted, FALSE if not
  *************************************************************************/
-BOOL signalUserInitiateHeatDisinfectActiveCoolMode( void )
+BOOL signalUserInitiateActiveCoolMode( void )
 {
     BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
@@ -844,13 +844,13 @@
                 break;
 
             case DG_MODE_HEAT:
-                if ( DG_CMD_START_HEAT_DISINFECT == currentDGCleaningMode.startRequestCmdID )
+                if ( DG_CMD_START_HEAT_DISINFECT_ACTIVE_COOL == currentDGCleaningMode.startRequestCmdID )
                 {
-                    cmdStartDGHeatDisinfect();
+                    cmdStartDGHeatDisinfectActiveCool();
                 }
                 else
                 {
-                    cmdStartDGNocturnalHeatDisinfect();
+                    cmdStartDGHeatDisinfectPassiveCool();
                 }
                 break;
 
@@ -975,6 +975,8 @@
     {
         state = STANDBY_WAIT_FOR_TREATMENT_STATE;
         clearAlarm( currentDGCleaningMode.alarmID );
+        // In case alarm 306 has been triggered, and it was not cleared, clear it upon exiting the disinfection mode.
+        clearAlarm( ALARM_ID_DG_TURN_OFF_INLET_WATER_VALVES );
         clearCurrentCleaningModeStatus();
     }
 
@@ -1062,11 +1064,11 @@
  * @details Inputs: currentDGCleaningMode
  * @details Outputs: none
  * @param opMode DG operation mode that has been requested (i.e. heat disinfect)
- * @param isNocturnalHeatDis boolean flag to indicate whether this is a nocturnal
- * heat disinfect or not.
+ * @param isHeatDisPassiveCool boolean flag to indicate whether this is a passive
+ * cool heat disinfect or not.
  * @return none
  *************************************************************************/
-static void setRequestedCleaningMode( DG_OP_MODE_T opMode, BOOL isNocturnalHeatDis )
+static void setRequestedCleaningMode( DG_OP_MODE_T opMode, BOOL isHeatDisPassiveCool )
 {
     switch ( opMode )
     {
@@ -1081,7 +1083,7 @@
 
         case DG_MODE_HEAT:
             currentDGCleaningMode.startCleaningMode = TRUE;
-            currentDGCleaningMode.startRequestCmdID = ( FALSE == isNocturnalHeatDis ? DG_CMD_START_HEAT_DISINFECT : DG_CMD_START_NOCTURNAL_HEAT_DISINFECT );
+            currentDGCleaningMode.startRequestCmdID = ( FALSE == isHeatDisPassiveCool ? DG_CMD_START_HEAT_DISINFECT_ACTIVE_COOL : DG_CMD_START_HEAT_DISINFECT_PASSIVE_COOL );
             currentDGCleaningMode.dgOpMode          = DG_MODE_HEAT;
             currentDGCleaningMode.sampleRqstTrgrd   = FALSE;
             currentDGCleaningMode.alarmID           = ALARM_ID_HD_DISINFECT_HEAT;