Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r667feab319b14681a0330a715da7a1ba930b518d -r2a3a47ca90ad19851a30c52f6999a56d5f578783
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 2a3a47ca90ad19851a30c52f6999a56d5f578783)
@@ -435,11 +435,16 @@
  *************************************************************************/
 static HD_POST_TREATMENT_STATE_T handlePostTreatmentVerifyState( void )
 {
-#ifndef SKIP_CARTRIDGE_REMOVAL
-    BOOL isCartridgeRemoved = isCartridgeUnloaded();
-#else
+    // Assuming the cartridge door is removed already.
+    // This is used when the disable cartridge removal step software configuration is enabled
     BOOL isCartridgeRemoved = TRUE;
+
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CARTRIDGE_REMOVAL_STEP ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+    {
+        isCartridgeRemoved = isCartridgeUnloaded();
+    }
 
     if ( STATE_CLOSED == getFPGADoorState() )
     {