diff --git a/src/App/DocumentParams.cpp b/src/App/DocumentParams.cpp
index 6c3381606891..2d5817cfaaa1 100644
--- a/src/App/DocumentParams.cpp
+++ b/src/App/DocumentParams.cpp
@@ -28,21 +28,21 @@ import DocumentParams
 DocumentParams.define()
 ]]]*/
 
-// Auto generated code (Tools/params_utils.py:162)
+// Auto generated code (Tools/params_utils.py:166)
 #include <unordered_map>
 #include <App/Application.h>
 #include <App/DynamicProperty.h>
 #include "DocumentParams.h"
 using namespace App;
 
-// Auto generated code (Tools/params_utils.py:171)
+// Auto generated code (Tools/params_utils.py:175)
 namespace {
 class DocumentParamsP: public ParameterGrp::ObserverType {
 public:
     ParameterGrp::handle handle;
     std::unordered_map<const char *,void(*)(DocumentParamsP*),App::CStringHasher,App::CStringHasher> funcs;
 
-    // Auto generated code (Tools/params_utils.py:181)
+    // Auto generated code (Tools/params_utils.py:185)
     boost::signals2::signal<void (const char*)> signalParamChanged;
     void signalAll()
     {
@@ -73,9 +73,10 @@ class DocumentParamsP: public ParameterGrp::ObserverType {
         signalParamChanged("DuplicateLabels");
         signalParamChanged("TransactionOnRecompute");
         signalParamChanged("RelativeStringID");
+        signalParamChanged("HashIndexedName");
         signalParamChanged("EnableMaterialEdit");
 
-    // Auto generated code (Tools/params_utils.py:190)
+    // Auto generated code (Tools/params_utils.py:194)
     }
     std::string prefAuthor;
     bool prefSetAuthorOnSave;
@@ -104,9 +105,10 @@ class DocumentParamsP: public ParameterGrp::ObserverType {
     bool DuplicateLabels;
     bool TransactionOnRecompute;
     bool RelativeStringID;
+    bool HashIndexedName;
     bool EnableMaterialEdit;
 
-    // Auto generated code (Tools/params_utils.py:199)
+    // Auto generated code (Tools/params_utils.py:203)
     DocumentParamsP() {
         handle = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document");
         handle->Attach(this);
@@ -165,15 +167,17 @@ class DocumentParamsP: public ParameterGrp::ObserverType {
         funcs["TransactionOnRecompute"] = &DocumentParamsP::updateTransactionOnRecompute;
         RelativeStringID = handle->GetBool("RelativeStringID", true);
         funcs["RelativeStringID"] = &DocumentParamsP::updateRelativeStringID;
+        HashIndexedName = handle->GetBool("HashIndexedName", false);
+        funcs["HashIndexedName"] = &DocumentParamsP::updateHashIndexedName;
         EnableMaterialEdit = handle->GetBool("EnableMaterialEdit", true);
         funcs["EnableMaterialEdit"] = &DocumentParamsP::updateEnableMaterialEdit;
     }
 
-    // Auto generated code (Tools/params_utils.py:213)
+    // Auto generated code (Tools/params_utils.py:217)
     ~DocumentParamsP() {
     }
 
-    // Auto generated code (Tools/params_utils.py:218)
+    // Auto generated code (Tools/params_utils.py:222)
     void OnChange(Base::Subject<const char*> &, const char* sReason) {
         if(!sReason)
             return;
@@ -185,121 +189,125 @@ class DocumentParamsP: public ParameterGrp::ObserverType {
     }
 
 
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateprefAuthor(DocumentParamsP *self) {
         self->prefAuthor = self->handle->GetASCII("prefAuthor", "");
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateprefSetAuthorOnSave(DocumentParamsP *self) {
         self->prefSetAuthorOnSave = self->handle->GetBool("prefSetAuthorOnSave", false);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateprefCompany(DocumentParamsP *self) {
         self->prefCompany = self->handle->GetASCII("prefCompany", "");
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateprefLicenseType(DocumentParamsP *self) {
         self->prefLicenseType = self->handle->GetInt("prefLicenseType", 0);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateprefLicenseUrl(DocumentParamsP *self) {
         self->prefLicenseUrl = self->handle->GetASCII("prefLicenseUrl", "");
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateCompressionLevel(DocumentParamsP *self) {
         self->CompressionLevel = self->handle->GetInt("CompressionLevel", 3);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateCheckExtension(DocumentParamsP *self) {
         self->CheckExtension = self->handle->GetBool("CheckExtension", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateForceXML(DocumentParamsP *self) {
         self->ForceXML = self->handle->GetInt("ForceXML", 3);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateSplitXML(DocumentParamsP *self) {
         self->SplitXML = self->handle->GetBool("SplitXML", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updatePreferBinary(DocumentParamsP *self) {
         self->PreferBinary = self->handle->GetBool("PreferBinary", false);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateAutoRemoveFile(DocumentParamsP *self) {
         self->AutoRemoveFile = self->handle->GetBool("AutoRemoveFile", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateBackupPolicy(DocumentParamsP *self) {
         self->BackupPolicy = self->handle->GetBool("BackupPolicy", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateCreateBackupFiles(DocumentParamsP *self) {
         self->CreateBackupFiles = self->handle->GetBool("CreateBackupFiles", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateUseFCBakExtension(DocumentParamsP *self) {
         self->UseFCBakExtension = self->handle->GetBool("UseFCBakExtension", false);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateSaveBackupDateFormat(DocumentParamsP *self) {
         self->SaveBackupDateFormat = self->handle->GetASCII("SaveBackupDateFormat", "%Y%m%d-%H%M%S");
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateCountBackupFiles(DocumentParamsP *self) {
         self->CountBackupFiles = self->handle->GetInt("CountBackupFiles", 1);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateOptimizeRecompute(DocumentParamsP *self) {
         self->OptimizeRecompute = self->handle->GetBool("OptimizeRecompute", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateCanAbortRecompute(DocumentParamsP *self) {
         self->CanAbortRecompute = self->handle->GetBool("CanAbortRecompute", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateUseHasher(DocumentParamsP *self) {
         self->UseHasher = self->handle->GetBool("UseHasher", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateViewObjectTransaction(DocumentParamsP *self) {
         self->ViewObjectTransaction = self->handle->GetBool("ViewObjectTransaction", false);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateWarnRecomputeOnRestore(DocumentParamsP *self) {
         self->WarnRecomputeOnRestore = self->handle->GetBool("WarnRecomputeOnRestore", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateNoPartialLoading(DocumentParamsP *self) {
         self->NoPartialLoading = self->handle->GetBool("NoPartialLoading", false);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateThumbnailNoBackground(DocumentParamsP *self) {
         self->ThumbnailNoBackground = self->handle->GetBool("ThumbnailNoBackground", false);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateThumbnailSampleSize(DocumentParamsP *self) {
         self->ThumbnailSampleSize = self->handle->GetInt("ThumbnailSampleSize", 0);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateDuplicateLabels(DocumentParamsP *self) {
         self->DuplicateLabels = self->handle->GetBool("DuplicateLabels", false);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateTransactionOnRecompute(DocumentParamsP *self) {
         self->TransactionOnRecompute = self->handle->GetBool("TransactionOnRecompute", false);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateRelativeStringID(DocumentParamsP *self) {
         self->RelativeStringID = self->handle->GetBool("RelativeStringID", true);
     }
-    // Auto generated code (Tools/params_utils.py:234)
+    // Auto generated code (Tools/params_utils.py:238)
+    static void updateHashIndexedName(DocumentParamsP *self) {
+        self->HashIndexedName = self->handle->GetBool("HashIndexedName", false);
+    }
+    // Auto generated code (Tools/params_utils.py:238)
     static void updateEnableMaterialEdit(DocumentParamsP *self) {
         self->EnableMaterialEdit = self->handle->GetBool("EnableMaterialEdit", true);
     }
 };
 
-// Auto generated code (Tools/params_utils.py:252)
+// Auto generated code (Tools/params_utils.py:256)
 DocumentParamsP *instance() {
     static DocumentParamsP *inst = new DocumentParamsP;
     return inst;
@@ -307,774 +315,803 @@ DocumentParamsP *instance() {
 
 } // Anonymous namespace
 
-// Auto generated code (Tools/params_utils.py:261)
+// Auto generated code (Tools/params_utils.py:265)
 ParameterGrp::handle DocumentParams::getHandle() {
     return instance()->handle;
 }
 
-// Auto generated code (Tools/params_utils.py:269)
+// Auto generated code (Tools/params_utils.py:273)
 boost::signals2::signal<void (const char*)> &
 DocumentParams::signalParamChanged() {
     return instance()->signalParamChanged;
 }
 
-// Auto generated code (Tools/params_utils.py:276)
+// Auto generated code (Tools/params_utils.py:280)
 void signalAll() {
     instance()->signalAll();
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docprefAuthor() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const std::string & DocumentParams::getprefAuthor() {
     return instance()->prefAuthor;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const std::string & DocumentParams::defaultprefAuthor() {
     const static std::string def = "";
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setprefAuthor(const std::string &v) {
     instance()->handle->SetASCII("prefAuthor",v);
     instance()->prefAuthor = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeprefAuthor() {
     instance()->handle->RemoveASCII("prefAuthor");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docprefSetAuthorOnSave() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getprefSetAuthorOnSave() {
     return instance()->prefSetAuthorOnSave;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultprefSetAuthorOnSave() {
     const static bool def = false;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setprefSetAuthorOnSave(const bool &v) {
     instance()->handle->SetBool("prefSetAuthorOnSave",v);
     instance()->prefSetAuthorOnSave = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeprefSetAuthorOnSave() {
     instance()->handle->RemoveBool("prefSetAuthorOnSave");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docprefCompany() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const std::string & DocumentParams::getprefCompany() {
     return instance()->prefCompany;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const std::string & DocumentParams::defaultprefCompany() {
     const static std::string def = "";
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setprefCompany(const std::string &v) {
     instance()->handle->SetASCII("prefCompany",v);
     instance()->prefCompany = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeprefCompany() {
     instance()->handle->RemoveASCII("prefCompany");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docprefLicenseType() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const long & DocumentParams::getprefLicenseType() {
     return instance()->prefLicenseType;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const long & DocumentParams::defaultprefLicenseType() {
     const static long def = 0;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setprefLicenseType(const long &v) {
     instance()->handle->SetInt("prefLicenseType",v);
     instance()->prefLicenseType = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeprefLicenseType() {
     instance()->handle->RemoveInt("prefLicenseType");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docprefLicenseUrl() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const std::string & DocumentParams::getprefLicenseUrl() {
     return instance()->prefLicenseUrl;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const std::string & DocumentParams::defaultprefLicenseUrl() {
     const static std::string def = "";
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setprefLicenseUrl(const std::string &v) {
     instance()->handle->SetASCII("prefLicenseUrl",v);
     instance()->prefLicenseUrl = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeprefLicenseUrl() {
     instance()->handle->RemoveASCII("prefLicenseUrl");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docCompressionLevel() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const long & DocumentParams::getCompressionLevel() {
     return instance()->CompressionLevel;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const long & DocumentParams::defaultCompressionLevel() {
     const static long def = 3;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setCompressionLevel(const long &v) {
     instance()->handle->SetInt("CompressionLevel",v);
     instance()->CompressionLevel = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeCompressionLevel() {
     instance()->handle->RemoveInt("CompressionLevel");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docCheckExtension() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getCheckExtension() {
     return instance()->CheckExtension;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultCheckExtension() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setCheckExtension(const bool &v) {
     instance()->handle->SetBool("CheckExtension",v);
     instance()->CheckExtension = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeCheckExtension() {
     instance()->handle->RemoveBool("CheckExtension");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docForceXML() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const long & DocumentParams::getForceXML() {
     return instance()->ForceXML;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const long & DocumentParams::defaultForceXML() {
     const static long def = 3;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setForceXML(const long &v) {
     instance()->handle->SetInt("ForceXML",v);
     instance()->ForceXML = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeForceXML() {
     instance()->handle->RemoveInt("ForceXML");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docSplitXML() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getSplitXML() {
     return instance()->SplitXML;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultSplitXML() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setSplitXML(const bool &v) {
     instance()->handle->SetBool("SplitXML",v);
     instance()->SplitXML = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeSplitXML() {
     instance()->handle->RemoveBool("SplitXML");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docPreferBinary() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getPreferBinary() {
     return instance()->PreferBinary;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultPreferBinary() {
     const static bool def = false;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setPreferBinary(const bool &v) {
     instance()->handle->SetBool("PreferBinary",v);
     instance()->PreferBinary = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removePreferBinary() {
     instance()->handle->RemoveBool("PreferBinary");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docAutoRemoveFile() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getAutoRemoveFile() {
     return instance()->AutoRemoveFile;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultAutoRemoveFile() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setAutoRemoveFile(const bool &v) {
     instance()->handle->SetBool("AutoRemoveFile",v);
     instance()->AutoRemoveFile = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeAutoRemoveFile() {
     instance()->handle->RemoveBool("AutoRemoveFile");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docBackupPolicy() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getBackupPolicy() {
     return instance()->BackupPolicy;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultBackupPolicy() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setBackupPolicy(const bool &v) {
     instance()->handle->SetBool("BackupPolicy",v);
     instance()->BackupPolicy = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeBackupPolicy() {
     instance()->handle->RemoveBool("BackupPolicy");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docCreateBackupFiles() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getCreateBackupFiles() {
     return instance()->CreateBackupFiles;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultCreateBackupFiles() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setCreateBackupFiles(const bool &v) {
     instance()->handle->SetBool("CreateBackupFiles",v);
     instance()->CreateBackupFiles = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeCreateBackupFiles() {
     instance()->handle->RemoveBool("CreateBackupFiles");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docUseFCBakExtension() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getUseFCBakExtension() {
     return instance()->UseFCBakExtension;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultUseFCBakExtension() {
     const static bool def = false;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setUseFCBakExtension(const bool &v) {
     instance()->handle->SetBool("UseFCBakExtension",v);
     instance()->UseFCBakExtension = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeUseFCBakExtension() {
     instance()->handle->RemoveBool("UseFCBakExtension");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docSaveBackupDateFormat() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const std::string & DocumentParams::getSaveBackupDateFormat() {
     return instance()->SaveBackupDateFormat;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const std::string & DocumentParams::defaultSaveBackupDateFormat() {
     const static std::string def = "%Y%m%d-%H%M%S";
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setSaveBackupDateFormat(const std::string &v) {
     instance()->handle->SetASCII("SaveBackupDateFormat",v);
     instance()->SaveBackupDateFormat = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeSaveBackupDateFormat() {
     instance()->handle->RemoveASCII("SaveBackupDateFormat");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docCountBackupFiles() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const long & DocumentParams::getCountBackupFiles() {
     return instance()->CountBackupFiles;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const long & DocumentParams::defaultCountBackupFiles() {
     const static long def = 1;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setCountBackupFiles(const long &v) {
     instance()->handle->SetInt("CountBackupFiles",v);
     instance()->CountBackupFiles = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeCountBackupFiles() {
     instance()->handle->RemoveInt("CountBackupFiles");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docOptimizeRecompute() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getOptimizeRecompute() {
     return instance()->OptimizeRecompute;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultOptimizeRecompute() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setOptimizeRecompute(const bool &v) {
     instance()->handle->SetBool("OptimizeRecompute",v);
     instance()->OptimizeRecompute = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeOptimizeRecompute() {
     instance()->handle->RemoveBool("OptimizeRecompute");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docCanAbortRecompute() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getCanAbortRecompute() {
     return instance()->CanAbortRecompute;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultCanAbortRecompute() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setCanAbortRecompute(const bool &v) {
     instance()->handle->SetBool("CanAbortRecompute",v);
     instance()->CanAbortRecompute = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeCanAbortRecompute() {
     instance()->handle->RemoveBool("CanAbortRecompute");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docUseHasher() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getUseHasher() {
     return instance()->UseHasher;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultUseHasher() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setUseHasher(const bool &v) {
     instance()->handle->SetBool("UseHasher",v);
     instance()->UseHasher = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeUseHasher() {
     instance()->handle->RemoveBool("UseHasher");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docViewObjectTransaction() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getViewObjectTransaction() {
     return instance()->ViewObjectTransaction;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultViewObjectTransaction() {
     const static bool def = false;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setViewObjectTransaction(const bool &v) {
     instance()->handle->SetBool("ViewObjectTransaction",v);
     instance()->ViewObjectTransaction = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeViewObjectTransaction() {
     instance()->handle->RemoveBool("ViewObjectTransaction");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docWarnRecomputeOnRestore() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getWarnRecomputeOnRestore() {
     return instance()->WarnRecomputeOnRestore;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultWarnRecomputeOnRestore() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setWarnRecomputeOnRestore(const bool &v) {
     instance()->handle->SetBool("WarnRecomputeOnRestore",v);
     instance()->WarnRecomputeOnRestore = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeWarnRecomputeOnRestore() {
     instance()->handle->RemoveBool("WarnRecomputeOnRestore");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docNoPartialLoading() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getNoPartialLoading() {
     return instance()->NoPartialLoading;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultNoPartialLoading() {
     const static bool def = false;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setNoPartialLoading(const bool &v) {
     instance()->handle->SetBool("NoPartialLoading",v);
     instance()->NoPartialLoading = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeNoPartialLoading() {
     instance()->handle->RemoveBool("NoPartialLoading");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docThumbnailNoBackground() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getThumbnailNoBackground() {
     return instance()->ThumbnailNoBackground;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultThumbnailNoBackground() {
     const static bool def = false;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setThumbnailNoBackground(const bool &v) {
     instance()->handle->SetBool("ThumbnailNoBackground",v);
     instance()->ThumbnailNoBackground = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeThumbnailNoBackground() {
     instance()->handle->RemoveBool("ThumbnailNoBackground");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docThumbnailSampleSize() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const long & DocumentParams::getThumbnailSampleSize() {
     return instance()->ThumbnailSampleSize;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const long & DocumentParams::defaultThumbnailSampleSize() {
     const static long def = 0;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setThumbnailSampleSize(const long &v) {
     instance()->handle->SetInt("ThumbnailSampleSize",v);
     instance()->ThumbnailSampleSize = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeThumbnailSampleSize() {
     instance()->handle->RemoveInt("ThumbnailSampleSize");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docDuplicateLabels() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getDuplicateLabels() {
     return instance()->DuplicateLabels;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultDuplicateLabels() {
     const static bool def = false;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setDuplicateLabels(const bool &v) {
     instance()->handle->SetBool("DuplicateLabels",v);
     instance()->DuplicateLabels = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeDuplicateLabels() {
     instance()->handle->RemoveBool("DuplicateLabels");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docTransactionOnRecompute() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getTransactionOnRecompute() {
     return instance()->TransactionOnRecompute;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultTransactionOnRecompute() {
     const static bool def = false;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setTransactionOnRecompute(const bool &v) {
     instance()->handle->SetBool("TransactionOnRecompute",v);
     instance()->TransactionOnRecompute = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeTransactionOnRecompute() {
     instance()->handle->RemoveBool("TransactionOnRecompute");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docRelativeStringID() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getRelativeStringID() {
     return instance()->RelativeStringID;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultRelativeStringID() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setRelativeStringID(const bool &v) {
     instance()->handle->SetBool("RelativeStringID",v);
     instance()->RelativeStringID = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeRelativeStringID() {
     instance()->handle->RemoveBool("RelativeStringID");
 }
 
-// Auto generated code (Tools/params_utils.py:284)
+// Auto generated code (Tools/params_utils.py:288)
+const char *DocumentParams::docHashIndexedName() {
+    return QT_TRANSLATE_NOOP("DocumentParams",
+"Enable special encoding of indexes name in toponaming. Disabled by\n"
+"default for backward compatibility");
+}
+
+// Auto generated code (Tools/params_utils.py:294)
+const bool & DocumentParams::getHashIndexedName() {
+    return instance()->HashIndexedName;
+}
+
+// Auto generated code (Tools/params_utils.py:300)
+const bool & DocumentParams::defaultHashIndexedName() {
+    const static bool def = false;
+    return def;
+}
+
+// Auto generated code (Tools/params_utils.py:307)
+void DocumentParams::setHashIndexedName(const bool &v) {
+    instance()->handle->SetBool("HashIndexedName",v);
+    instance()->HashIndexedName = v;
+}
+
+// Auto generated code (Tools/params_utils.py:314)
+void DocumentParams::removeHashIndexedName() {
+    instance()->handle->RemoveBool("HashIndexedName");
+}
+
+// Auto generated code (Tools/params_utils.py:288)
 const char *DocumentParams::docEnableMaterialEdit() {
     return "";
 }
 
-// Auto generated code (Tools/params_utils.py:290)
+// Auto generated code (Tools/params_utils.py:294)
 const bool & DocumentParams::getEnableMaterialEdit() {
     return instance()->EnableMaterialEdit;
 }
 
-// Auto generated code (Tools/params_utils.py:296)
+// Auto generated code (Tools/params_utils.py:300)
 const bool & DocumentParams::defaultEnableMaterialEdit() {
     const static bool def = true;
     return def;
 }
 
-// Auto generated code (Tools/params_utils.py:303)
+// Auto generated code (Tools/params_utils.py:307)
 void DocumentParams::setEnableMaterialEdit(const bool &v) {
     instance()->handle->SetBool("EnableMaterialEdit",v);
     instance()->EnableMaterialEdit = v;
 }
 
-// Auto generated code (Tools/params_utils.py:310)
+// Auto generated code (Tools/params_utils.py:314)
 void DocumentParams::removeEnableMaterialEdit() {
     instance()->handle->RemoveBool("EnableMaterialEdit");
 }
diff --git a/src/App/DocumentParams.h b/src/App/DocumentParams.h
index 36dd26069a48..1a4e690ac5a8 100644
--- a/src/App/DocumentParams.h
+++ b/src/App/DocumentParams.h
@@ -28,11 +28,11 @@ import DocumentParams
 DocumentParams.declare()
 ]]]*/
 
-// Auto generated code (Tools/params_utils.py:68)
+// Auto generated code (Tools/params_utils.py:72)
 #include <Base/Parameter.h>
 #include <boost_signals2.hpp>
 
-// Auto generated code (Tools/params_utils.py:74)
+// Auto generated code (Tools/params_utils.py:78)
 namespace App {
 /** Convenient class to obtain App::Document related parameters
 
@@ -71,7 +71,7 @@ class AppExport DocumentParams {
     static boost::signals2::signal<void (const char*)> &signalParamChanged();
     static void signalAll();
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter prefAuthor
     static const std::string & getprefAuthor();
@@ -81,7 +81,7 @@ class AppExport DocumentParams {
     static const char *docprefAuthor();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter prefSetAuthorOnSave
     static const bool & getprefSetAuthorOnSave();
@@ -91,7 +91,7 @@ class AppExport DocumentParams {
     static const char *docprefSetAuthorOnSave();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter prefCompany
     static const std::string & getprefCompany();
@@ -101,7 +101,7 @@ class AppExport DocumentParams {
     static const char *docprefCompany();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter prefLicenseType
     static const long & getprefLicenseType();
@@ -111,7 +111,7 @@ class AppExport DocumentParams {
     static const char *docprefLicenseType();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter prefLicenseUrl
     static const std::string & getprefLicenseUrl();
@@ -121,7 +121,7 @@ class AppExport DocumentParams {
     static const char *docprefLicenseUrl();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter CompressionLevel
     static const long & getCompressionLevel();
@@ -131,7 +131,7 @@ class AppExport DocumentParams {
     static const char *docCompressionLevel();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter CheckExtension
     static const bool & getCheckExtension();
@@ -141,7 +141,7 @@ class AppExport DocumentParams {
     static const char *docCheckExtension();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter ForceXML
     static const long & getForceXML();
@@ -151,7 +151,7 @@ class AppExport DocumentParams {
     static const char *docForceXML();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter SplitXML
     static const bool & getSplitXML();
@@ -161,7 +161,7 @@ class AppExport DocumentParams {
     static const char *docSplitXML();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter PreferBinary
     static const bool & getPreferBinary();
@@ -171,7 +171,7 @@ class AppExport DocumentParams {
     static const char *docPreferBinary();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter AutoRemoveFile
     static const bool & getAutoRemoveFile();
@@ -181,7 +181,7 @@ class AppExport DocumentParams {
     static const char *docAutoRemoveFile();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter BackupPolicy
     static const bool & getBackupPolicy();
@@ -191,7 +191,7 @@ class AppExport DocumentParams {
     static const char *docBackupPolicy();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter CreateBackupFiles
     static const bool & getCreateBackupFiles();
@@ -201,7 +201,7 @@ class AppExport DocumentParams {
     static const char *docCreateBackupFiles();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter UseFCBakExtension
     static const bool & getUseFCBakExtension();
@@ -211,7 +211,7 @@ class AppExport DocumentParams {
     static const char *docUseFCBakExtension();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter SaveBackupDateFormat
     static const std::string & getSaveBackupDateFormat();
@@ -221,7 +221,7 @@ class AppExport DocumentParams {
     static const char *docSaveBackupDateFormat();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter CountBackupFiles
     static const long & getCountBackupFiles();
@@ -231,7 +231,7 @@ class AppExport DocumentParams {
     static const char *docCountBackupFiles();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter OptimizeRecompute
     static const bool & getOptimizeRecompute();
@@ -241,7 +241,7 @@ class AppExport DocumentParams {
     static const char *docOptimizeRecompute();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter CanAbortRecompute
     static const bool & getCanAbortRecompute();
@@ -251,7 +251,7 @@ class AppExport DocumentParams {
     static const char *docCanAbortRecompute();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter UseHasher
     static const bool & getUseHasher();
@@ -261,7 +261,7 @@ class AppExport DocumentParams {
     static const char *docUseHasher();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter ViewObjectTransaction
     static const bool & getViewObjectTransaction();
@@ -271,7 +271,7 @@ class AppExport DocumentParams {
     static const char *docViewObjectTransaction();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter WarnRecomputeOnRestore
     static const bool & getWarnRecomputeOnRestore();
@@ -281,7 +281,7 @@ class AppExport DocumentParams {
     static const char *docWarnRecomputeOnRestore();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter NoPartialLoading
     static const bool & getNoPartialLoading();
@@ -291,7 +291,7 @@ class AppExport DocumentParams {
     static const char *docNoPartialLoading();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter ThumbnailNoBackground
     static const bool & getThumbnailNoBackground();
@@ -301,7 +301,7 @@ class AppExport DocumentParams {
     static const char *docThumbnailNoBackground();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter ThumbnailSampleSize
     static const long & getThumbnailSampleSize();
@@ -311,7 +311,7 @@ class AppExport DocumentParams {
     static const char *docThumbnailSampleSize();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter DuplicateLabels
     static const bool & getDuplicateLabels();
@@ -321,7 +321,7 @@ class AppExport DocumentParams {
     static const char *docDuplicateLabels();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter TransactionOnRecompute
     static const bool & getTransactionOnRecompute();
@@ -331,7 +331,7 @@ class AppExport DocumentParams {
     static const char *docTransactionOnRecompute();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter RelativeStringID
     static const bool & getRelativeStringID();
@@ -341,7 +341,20 @@ class AppExport DocumentParams {
     static const char *docRelativeStringID();
     //@}
 
-    // Auto generated code (Tools/params_utils.py:118)
+    // Auto generated code (Tools/params_utils.py:122)
+    //@{
+    /// Accessor for parameter HashIndexedName
+    ///
+    /// Enable special encoding of indexes name in toponaming. Disabled by
+    /// default for backward compatibility
+    static const bool & getHashIndexedName();
+    static const bool & defaultHashIndexedName();
+    static void removeHashIndexedName();
+    static void setHashIndexedName(const bool &v);
+    static const char *docHashIndexedName();
+    //@}
+
+    // Auto generated code (Tools/params_utils.py:122)
     //@{
     /// Accessor for parameter EnableMaterialEdit
     static const bool & getEnableMaterialEdit();
@@ -351,7 +364,7 @@ class AppExport DocumentParams {
     static const char *docEnableMaterialEdit();
     //@}
 
-// Auto generated code (Tools/params_utils.py:146)
+// Auto generated code (Tools/params_utils.py:150)
 }; // class DocumentParams
 } // namespace App
 //[[[end]]]
diff --git a/src/App/DocumentParams.py b/src/App/DocumentParams.py
index 943f22c0ebc0..56b5d9f0812e 100644
--- a/src/App/DocumentParams.py
+++ b/src/App/DocumentParams.py
@@ -64,6 +64,9 @@
     ParamBool('DuplicateLabels', False),
     ParamBool('TransactionOnRecompute', False),
     ParamBool('RelativeStringID', True),
+    ParamBool('HashIndexedName', False,
+        doc='Enable special encoding of indexes name in toponaming. Disabled by\n'
+            'default for backward compatibility'),
     ParamBool('EnableMaterialEdit', True),
 ]
 
diff --git a/src/App/StringHasher.cpp b/src/App/StringHasher.cpp
index 5cd1cc2372f6..6492734b65c7 100644
--- a/src/App/StringHasher.cpp
+++ b/src/App/StringHasher.cpp
@@ -284,7 +284,7 @@ StringIDRef StringHasher::getID(const Data::MappedName &name,
     d._postfix = name.postfixBytes();
 
     Data::IndexedName indexed;
-    if (d._postfix.size()) {
+    if (DocumentParams::getHashIndexedName() && d._postfix.size()) {
         // Only check for IndexedName if there is postfix, because of the way
         // we restore the StringID. See StringHasher::saveStream/restoreStreamNew()
         indexed = Data::IndexedName(name.dataBytes());
@@ -358,20 +358,22 @@ StringIDRef StringHasher::getID(const Data::MappedName &name,
         // StringHasher::saveStream/restoreStreamNew()
         StringID::IndexID res = StringID::fromString(id._data);
         if (res.id > 0) {
-            if (res.index != 0) {
-                indexed.setIndex(res.index);
-                id._data.resize(id._data.lastIndexOf(':')+1);
-            }
-            int offset = id.isPostfixEncoded() ? 1 : 0;
-            for (int i=offset; i<id._sids.size();++i) {
-                if (id._sids[i].value() == res.id) {
-                    if (i!=offset)
-                        std::swap(id._sids[offset], id._sids[i]);
-                    if (res.index != 0)
-                        id._flags.set(StringID::PrefixIDIndex);
-                    else
-                        id._flags.set(StringID::PrefixID);
-                    break;
+            if (DocumentParams::getHashIndexedName() || res.index == 0) {
+                if (res.index != 0) {
+                    indexed.setIndex(res.index);
+                    id._data.resize(id._data.lastIndexOf(':')+1);
+                }
+                int offset = id.isPostfixEncoded() ? 1 : 0;
+                for (int i=offset; i<id._sids.size();++i) {
+                    if (id._sids[i].value() == res.id) {
+                        if (i!=offset)
+                            std::swap(id._sids[offset], id._sids[i]);
+                        if (res.index != 0)
+                            id._flags.set(StringID::PrefixIDIndex);
+                        else
+                            id._flags.set(StringID::PrefixID);
+                        break;
+                    }
                 }
             }
         }