Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500 -r2cb4ff0f8a0ad74826c5c9b4d0e84c6334c960d6
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 2cb4ff0f8a0ad74826c5c9b4d0e84c6334c960d6)
@@ -117,6 +117,8 @@
  *************************************************************************/
 U32 transitionToStandbyMode( void )
 {
+    HD_OP_MODE_T previousOpMode = getPreviousOperationMode();
+
     // Re-initialize when transitioning to standby mode
     initStandbyMode();
     initDGInterface();
@@ -143,6 +145,11 @@
     setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
 
+    // If we just exited Post Treatment Mode, goto disinfect sub state.
+    if ( MODE_POST == previousOpMode )
+    {
+        currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
+    }
     // Request DG service record and usage information from DG
     sendDGServiceRequestToDG();
     sendDGUsageInfoRequestToDG();
@@ -420,28 +427,49 @@
  * initiation of setting the disinfects submode.
  * @details Inputs: currentStandbyState
  * @details Outputs: currentStandbyState
+ * @param cmd initiate (1) or cancel (0)
  * @return TRUE if signal accepted, FALSE if not
  *************************************************************************/
-BOOL signalInitiateStandbyDisinfectSubmode( void )
+BOOL signalInitiateStandbyDisinfectSubmode( U32 cmd )
 {
     BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
 
-    if ( ( MODE_STAN == getCurrentOperationMode() ) && ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) )
+    if ( cmd == 0 )
     {
-        if ( TRUE == isDGCommunicating() )
+        // Cancel Disinfect command
+        if ( STANDBY_WAIT_FOR_DISINFECT_STATE == currentStandbyState )
         {
-            currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
+            currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
             result              = TRUE;
             rejReason           = REQUEST_REJECT_REASON_NONE;
         }
         else
         {
-            rejReason = REQUEST_REJECT_REASON_DG_COMM_LOST;
+            result              = FALSE;
+            rejReason           = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
         }
     }
+    else
+    {
+        // Initiate Disinfect command
+        if ( ( MODE_STAN == getCurrentOperationMode() ) && ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) )
+        {
+            if ( TRUE == isDGCommunicating() )
+            {
+                currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
+                result              = TRUE;
+                rejReason           = REQUEST_REJECT_REASON_NONE;
+            }
+            else
+            {
+                result              = FALSE;
+                rejReason           = REQUEST_REJECT_REASON_DG_COMM_LOST;
+            }
+        }
+    }
 
-    sendDisinfectConfirmResponse( result, rejReason );
+    handleSetHDStandbyDisinfectSubmodeResponse( result, rejReason );
 
     return result;
 }
@@ -636,6 +664,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_DG_FLUSH_IN_PROGRESS_STATE;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DISINFECT_FLUSH, 0 );
     }
 
     return state;
@@ -657,6 +686,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_WAIT_FOR_TREATMENT_STATE;
+        clearAlarm( ALARM_ID_HD_DISINFECT_FLUSH );
     }
 
     publishDisinfectData();
@@ -712,6 +742,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DISINFECT_HEAT, 0 );
     }
 
     return state;
@@ -733,6 +764,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_WAIT_FOR_TREATMENT_STATE;
+        clearAlarm( ALARM_ID_HD_DISINFECT_HEAT );
     }
 
     publishDisinfectData();
@@ -789,6 +821,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DISINFECT_CHEM, 0 );
     }
 
     return state;
@@ -810,6 +843,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_WAIT_FOR_TREATMENT_STATE;
+        clearAlarm( ALARM_ID_HD_DISINFECT_CHEM );
     }
 
     publishDisinfectData();