diff --git a/workflow/engine/methods/processes/mainInit.php b/workflow/engine/methods/processes/mainInit.php
index 83d7123bd..2ae1c4898 100755
--- a/workflow/engine/methods/processes/mainInit.php
+++ b/workflow/engine/methods/processes/mainInit.php
@@ -31,7 +31,16 @@ $conf = new Configurations();
 
 $pmVersion = (preg_match("/^([\d\.]+).*$/", System::getVersion(), $arrayMatch))? $arrayMatch[1] : ""; //Otherwise: Branch master
 
-$arrayFlagImportFileExtension = array("pm", "pmx", "bpmn");
+/*----------------------------------********---------------------------------*/
+if (true) {
+    $arrayFlagImportFileExtension = array("pm", "pmx", "pmx2", "bpmn");
+} else {
+/*----------------------------------********---------------------------------*/
+    $arrayFlagImportFileExtension = array("pm", "pmx", "bpmn");
+/*----------------------------------********---------------------------------*/
+}
+/*----------------------------------********---------------------------------*/
+
 $arrayFlagMenuNewOption       = array("pm" => true, "bpmn" => true);
 
 if ($pmVersion != "") {
diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php
index 3dc8ebda5..50d738148 100644
--- a/workflow/engine/methods/processes/processes_Import_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Import_Ajax.php
@@ -33,7 +33,7 @@ $objectsToImport = '';
 if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=") &&
     isset($_FILES["PROCESS_FILENAME"]) &&
     $_FILES["PROCESS_FILENAME"]["error"] == 0 &&
-    preg_match("/^(?:pm|pmx)$/", pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION))
+    preg_match("/^(?:pm|pmx|pmx2)$/", pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION))
 ) {
     //Check disabled code
     $response = array();
@@ -55,6 +55,7 @@ if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm
                 }
                 break;
             case "pmx":
+            case "pmx2":
                 $importer = new XmlImporter();
                 $data = $importer->load($_FILES["PROCESS_FILENAME"]["tmp_name"]);
                 if (isset($data["tables"]["workflow"]["triggers"]) && is_array($data["tables"]["workflow"]["triggers"]) && !empty($data["tables"]["workflow"]["triggers"])) {
@@ -109,8 +110,9 @@ if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm
 }
 /*----------------------------------********---------------------------------*/
 
-if (isset($_FILES["PROCESS_FILENAME"]) &&
-    pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION) == "pmx"
+if (isset($_FILES["PROCESS_FILENAME"]) && (pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION) == "pmx"
+        || pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION) == "pmx2")
+
 ) {
     $importer = new XmlImporter();
     $importer->setData("usr_uid", $_SESSION["USER_LOGGED"]);
@@ -219,8 +221,10 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
 }
 
 if (isset($_POST["PRO_FILENAME"]) &&
-    file_exists(PATH_DOCUMENT . "input" . PATH_SEP . $_POST["PRO_FILENAME"]) &&
-    pathinfo(PATH_DOCUMENT . "input" . PATH_SEP . $_POST["PRO_FILENAME"], PATHINFO_EXTENSION) == "pmx"
+    file_exists(PATH_DOCUMENT . "input" . PATH_SEP . $_POST["PRO_FILENAME"]) && (pathinfo(PATH_DOCUMENT . "input" .
+            PATH_SEP . $_POST["PRO_FILENAME"], PATHINFO_EXTENSION) == "pmx" || pathinfo(PATH_DOCUMENT . "input" .
+            PATH_SEP . $_POST["PRO_FILENAME"], PATHINFO_EXTENSION) == "pmx2")
+
 ) {
     $option = XmlImporter::IMPORT_OPTION_CREATE_NEW;
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
index 5766f228f..5186c7e03 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
@@ -55,8 +55,8 @@ class GranularExporter
         $projectData = $bpmnProject->getProject();
         $getProjectName = $this->publisher->truncateName($projectData['PRJ_NAME'], false);
         $outputDir = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP;
-        $version = \ProcessMaker\Util\Common::getLastVersion($outputDir . $getProjectName . "-*.pmx") + 1;
-        $outputFilename = $outputDir . sprintf("%s-%s.%s", str_replace(" ", "_", $getProjectName), $version, "pmx");
+        $version = \ProcessMaker\Util\Common::getLastVersion($outputDir . $getProjectName . "-*.pmx2") + 1;
+        $outputFilename = $outputDir . sprintf("%s-%s.%s", str_replace(" ", "_", $getProjectName), $version, "pmx2");
 
         $bpnmDefinition = array(
                         'ACTIVITY'      => [],
diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js
index 644935f6e..f6798e343 100755
--- a/workflow/engine/templates/processes/main.js
+++ b/workflow/engine/templates/processes/main.js
@@ -1914,6 +1914,9 @@ importProcess = function()
                       switch (fileExtension) {
                           case "pm":
                           case "pmx":
+                          /*----------------------------------********---------------------------------*/
+                          case "pmx2":
+                          /*----------------------------------********---------------------------------*/
                               var uploader = Ext.getCmp("uploader");
 
                               if (uploader.getForm().isValid()) {