diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index 9947b9161..3de4e6de2 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -516,6 +516,9 @@ int main(int argc, char* argv[])
     string Port = "3306";
     string User = "";
     string Password = "";
+    string TLSCA = "";
+    string TLSClientCert = "";
+    string TLSClientKey = "";
 
     try
     {
@@ -542,6 +545,28 @@ int main(int argc, char* argv[])
     catch (...)
     {}
 
+    try
+    {
+        TLSCA = sysConfigOld->getConfig("CrossEngineSupport", "TLSCA");
+        TLSClientCert = sysConfigOld->getConfig("CrossEngineSupport", "TLSClientCert");
+        TLSClientKey = sysConfigOld->getConfig("CrossEngineSupport", "TLSClientKey");
+    }
+    catch (...)
+    {
+        TLSCA = "";
+        TLSClientCert = "";
+        TLSClientKey = "";
+    }
+
+    try
+    {
+        sysConfigNew->setConfig("CrossEngineSupport", "TLSCA", TLSCA);
+        sysConfigNew->setConfig("CrossEngineSupport", "TLSClientCert", TLSClientCert);
+        sysConfigNew->setConfig("CrossEngineSupport", "TLSClientKey", TLSClientKey);
+    }
+    catch (...)
+    {}
+
     //QueryStats and UserPriority
     string QueryStats = "N";
     string UserPriority = "N";
@@ -2117,6 +2142,7 @@ int main(int argc, char* argv[])
     string PrefetchThreshold;
     string MaxOutstandingRequests;
     string PmMaxMemorySmallSide;
+    string ThreadPoolSize;
 
     try
     {
@@ -2124,6 +2150,7 @@ int main(int argc, char* argv[])
         PrefetchThreshold = sysConfigOld->getConfig("PrimitiveServers", "PrefetchThreshold");
         MaxOutstandingRequests = sysConfigOld->getConfig("JobList", "MaxOutstandingRequests");
         PmMaxMemorySmallSide = sysConfigOld->getConfig("HashJoin", "PmMaxMemorySmallSide");
+        ThreadPoolSize = sysConfigOld->getConfig("JobList", "ThreadPoolSize");
     }
     catch (...)
     {}
@@ -2134,6 +2161,7 @@ int main(int argc, char* argv[])
         sysConfigNew->setConfig("PrimitiveServers", "PrefetchThreshold", PrefetchThreshold);
         sysConfigNew->setConfig("JobList", "MaxOutstandingRequests", MaxOutstandingRequests);
         sysConfigNew->setConfig("HashJoin", "PmMaxMemorySmallSide", PmMaxMemorySmallSide);
+        sysConfigNew->setConfig("JobList", "ThreadPoolSize", ThreadPoolSize);
     }
     catch (...)
     {}