diff --git a/class.Build.php b/class.Build.php
index 1f84fa53f..bd241cdf2 100755
--- a/class.Build.php
+++ b/class.Build.php
@@ -39,7 +39,7 @@ class ProcessMakerPhpBuilderHelper
      * Build temporal directory
      * @var string
      */
-    public $buildTempDir = "./workflow/buildTemp";
+    public $buildTempDir = "./shared/buildTemp";
     /**
      * Production directories
      * @var array
@@ -141,10 +141,11 @@ class ProcessMakerPhpBuilderHelper
         }
         $this->baseDir = empty($config['base_dir']) ? $baseDir : $config['base_dir'];
         $this->publicDir = $this->baseDir . "/workflow/public_html";
-        $this->buildTempDir = $this->baseDir . "/workflow/buildTemp";
+        $this->buildTempDir = $this->baseDir . "/shared/buildTemp";
         $this->logDir = $this->baseDir . "/shared/log";
         if (defined('PATH_DATA')) {
             $this->logDir = PATH_DATA . "log";
+            $this->buildTempDir = PATH_DATA . "buildTemp";
         }
         $this->utils->__set("logDir", $this->logDir);
         $this->utils->refreshDir($this->buildTempDir);
diff --git a/workflow/engine/methods/setup/pluginsChange.php b/workflow/engine/methods/setup/pluginsChange.php
index 8db040983..9d5453157 100755
--- a/workflow/engine/methods/setup/pluginsChange.php
+++ b/workflow/engine/methods/setup/pluginsChange.php
@@ -88,16 +88,20 @@ if ($handle = opendir( PATH_PLUGINS )) {
         }
     }
     closedir( $handle );
+
     /**
      * Calls PMExtensionClass Builder to include Plugins changes.
      */
+    $config = Bootstrap::getSystemConfiguration();
 
-    $phpBuilder = new ProcessMakerPhpBuilderHelper();
-    $phpBuilder->enabledExtensions = $oPluginRegistry->getEnabledPlugins();
-    if (!empty($phpBuilder->enabledExtensions)) {
-        $phpBuilder->extension = true;
+    if (!empty($config['experimental_features'])) {
+        $phpBuilder = new ProcessMakerPhpBuilderHelper();
+        $phpBuilder->enabledExtensions = $oPluginRegistry->getEnabledPlugins();
+        if (!empty($phpBuilder->enabledExtensions)) {
+            $phpBuilder->extension = true;
+        }
+        $phpBuilder->buildAll();
     }
-    $phpBuilder->buildAll();
 }
 
   //$oPluginRegistry->showArrays();