Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r38355442b06187fe5d57deca647b3adf2fa26b89 -r437ac340cfe0bd90bc016372113bae3d594b7526
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 38355442b06187fe5d57deca647b3adf2fa26b89)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 437ac340cfe0bd90bc016372113bae3d594b7526)
@@ -151,7 +151,13 @@
             break;
 
         case HD_FAULT_STATE_COMPLETE:
-            // Do nothing. Done with the NV operations
+            // Do nothing unless the test configuration to recover treatment is enabled
+            if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) ) && ( TRUE == hasRecoverFromFaultModeBeenSet() ) )
+            {
+                HD_OP_MODE_T prevMode = getPreviousOperationMode();
+
+                requestNewOperationMode( prevMode );
+            }
             break;
 
         default: