diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index 49791a13e..9b6975e59 100644
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -1211,6 +1211,19 @@ class Derivation
                                 $this->case->closeAppThread( $currentDelegation['APP_UID'], $iAppThreadIndex );
                                 break;
                             default:
+                                if ($nextDel['ROU_PREVIOUS_TYPE'] == 'SEC-JOIN') {
+                                    $criteria = new Criteria('workflow');
+                                    $criteria->clearSelectColumns();
+                                    $criteria->addSelectColumn(AppThreadPeer::APP_THREAD_PARENT);
+                                    $criteria->add(AppThreadPeer::APP_UID, $appFields['APP_UID']);
+                                    $criteria->add(AppThreadPeer::APP_THREAD_STATUS, 'OPEN');
+                                    $criteria->add(AppThreadPeer::APP_THREAD_INDEX, $iAppThreadIndex);
+                                    $rsCriteria = AppThreadPeer::doSelectRS($criteria);
+                                    $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                                    if ($rsCriteria->next()) {
+                                        $this->case->closeAppThread($currentDelegation['APP_UID'], $iAppThreadIndex);
+                                    }
+                                }
                                 if ($currentDelegation['TAS_ASSIGN_TYPE'] == 'STATIC_MI' || $currentDelegation['TAS_ASSIGN_TYPE'] == 'CANCEL_MI') {
                                     $this->case->closeAppThread( $currentDelegation['APP_UID'], $iAppThreadIndex );
                                 }
diff --git a/workflow/engine/methods/setup/pluginsChange.php b/workflow/engine/methods/setup/pluginsChange.php
index 9d5453157..687fa4ef8 100644
--- a/workflow/engine/methods/setup/pluginsChange.php
+++ b/workflow/engine/methods/setup/pluginsChange.php
@@ -92,16 +92,12 @@ if ($handle = opendir( PATH_PLUGINS )) {
     /**
      * Calls PMExtensionClass Builder to include Plugins changes.
      */
-    $config = Bootstrap::getSystemConfiguration();
-
-    if (!empty($config['experimental_features'])) {
-        $phpBuilder = new ProcessMakerPhpBuilderHelper();
-        $phpBuilder->enabledExtensions = $oPluginRegistry->getEnabledPlugins();
-        if (!empty($phpBuilder->enabledExtensions)) {
-            $phpBuilder->extension = true;
-        }
-        $phpBuilder->buildAll();
+    $phpBuilder = new ProcessMakerPhpBuilderHelper();
+    $phpBuilder->enabledExtensions = $oPluginRegistry->getEnabledPlugins();
+    if (!empty($phpBuilder->enabledExtensions)) {
+        $phpBuilder->extension = true;
     }
+    $phpBuilder->buildAll();
 }
 
   //$oPluginRegistry->showArrays();