Index: firmware/App/Services/StateServices/TubeSetAutoEject.c
===================================================================
diff -u -r6a556cdfdb227850a6220981f164143b3dca5a80 -rf3a51a00cc2d17944d7af069adc5041a804d4572
--- firmware/App/Services/StateServices/TubeSetAutoEject.c	(.../TubeSetAutoEject.c)	(revision 6a556cdfdb227850a6220981f164143b3dca5a80)
+++ firmware/App/Services/StateServices/TubeSetAutoEject.c	(.../TubeSetAutoEject.c)	(revision f3a51a00cc2d17944d7af069adc5041a804d4572)
@@ -85,6 +85,8 @@
  *************************************************************************/
 void execTubeSetAutoEject( void )
 {
+    TUBE_SET_AUTO_EJECT_STATE_T priorState = currentAutoEjectState;
+
     switch ( currentAutoEjectState )
     {
         case TUBE_SET_AUTO_EJECT_STATE_AWAIT_CONFIRMATION:
@@ -119,6 +121,11 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_POST_TX_AUTO_EJECT_INVALID_STATE, (U32)currentAutoEjectState );
             break;
     }
+
+    if ( priorState != currentAutoEjectState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_SUB_STATE_CHANGE, priorState, currentAutoEjectState );
+    }
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/StateServices/TubeSetInstall.c
===================================================================
diff -u -r6a556cdfdb227850a6220981f164143b3dca5a80 -rf3a51a00cc2d17944d7af069adc5041a804d4572
--- firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision 6a556cdfdb227850a6220981f164143b3dca5a80)
+++ firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision f3a51a00cc2d17944d7af069adc5041a804d4572)
@@ -84,6 +84,8 @@
  *************************************************************************/
 void execTubeSetInstall( void )
 {
+    TUBE_SET_INSTALL_STATE_T priorState = currentInstallState;
+
     switch( currentInstallState )
     {
         case TUBE_SET_INSTALL_STATE_AWAIT_TUBE_SET_CONFIRMATION:
@@ -110,6 +112,11 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TX_INSTALL_INVALID_STATE, (U32)currentInstallState );
             break;
     }
+
+    if ( priorState != currentInstallState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_SUB_STATE_CHANGE, priorState, currentInstallState );
+    }
 }
 
 /*********************************************************************//**