diff --git a/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java b/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java
index 4cb9612a9f..1a11fd4077 100644
--- a/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java
+++ b/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java
@@ -44,4 +44,16 @@ public final class TalendPropertiesUtil {
 
         return Boolean.parseBoolean(value);
     }
+
+    /**
+     * 
+     * DOC ggu Comment method "isEnabledMultiBranchesInWorkspacee".
+     * 
+     * @return
+     */
+    public static boolean isEnabledMultiBranchesInWorkspacee() {
+        String value = System.getProperty("talend.enable.multiBranchesInWorkspace"); //$NON-NLS-1$
+
+        return Boolean.parseBoolean(value);
+    }
 }
diff --git a/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java b/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java
index 2a75e5a1c3..6d0e5a6676 100644
--- a/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java
+++ b/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java
@@ -38,6 +38,7 @@ import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.RepositoryManager;
 import org.talend.core.model.repository.SVNConstant;
+import org.talend.core.model.utils.TalendPropertiesUtil;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.ui.IReferencedProjectService;
 import org.talend.repository.model.IProxyRepositoryFactory;
@@ -419,7 +420,8 @@ public final class ProjectManager {
     }
 
     public boolean enableSpecialTechnicalProjectName() {
-        return true; // FIXME TDI-21185, add the function to enable disabling this function.
+        // FIXME TDI-21185, add the function to enable disabling this function.
+        return TalendPropertiesUtil.isEnabledMultiBranchesInWorkspacee();
     }
 
     /**