diff --git a/IdeaPlugin/mpsEditorTestsPlugin.xml b/IdeaPlugin/mpsEditorTestsPlugin.xml
index 40208fa28b4b..f5016a117f5e 100644
--- a/IdeaPlugin/mpsEditorTestsPlugin.xml
+++ b/IdeaPlugin/mpsEditorTestsPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsEditorTestsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorTestsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorTestsPlugin" />
   <property name="mps_home" location="${basedir}" />
@@ -53,6 +55,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsIdeaMigration.xml b/IdeaPlugin/mpsIdeaMigration.xml
index b03ce2b2c387..d5ae7de03afa 100644
--- a/IdeaPlugin/mpsIdeaMigration.xml
+++ b/IdeaPlugin/mpsIdeaMigration.xml
@@ -1,6 +1,8 @@
 <project name="mpsIdeaMigration" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsIdeaMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsIdeaMigration" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -177,6 +179,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -202,6 +206,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/IdeaPlugin/mpsIdeaVcs.xml b/IdeaPlugin/mpsIdeaVcs.xml
index d6567848ff9c..94c71d9a35cd 100644
--- a/IdeaPlugin/mpsIdeaVcs.xml
+++ b/IdeaPlugin/mpsIdeaVcs.xml
@@ -1,6 +1,8 @@
 <project name="mpsIdeaVcs" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsIdeaVcs" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsIdeaVcs" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -389,6 +391,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -419,6 +423,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/IdeaPlugin/mpsJavaIdeaPlugin.xml b/IdeaPlugin/mpsJavaIdeaPlugin.xml
index 8ac8e1b58c55..a9a8236056f2 100644
--- a/IdeaPlugin/mpsJavaIdeaPlugin.xml
+++ b/IdeaPlugin/mpsJavaIdeaPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsJavaIdeaPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaIdeaPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaIdeaPlugin" />
   <property name="mps_home" location="${basedir}" />
@@ -88,6 +90,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsJpsIdea.xml b/IdeaPlugin/mpsJpsIdea.xml
index 4c7752a9c5e6..59d2a7aea8f9 100644
--- a/IdeaPlugin/mpsJpsIdea.xml
+++ b/IdeaPlugin/mpsJpsIdea.xml
@@ -1,6 +1,8 @@
 <project name="mpsJpsIdea" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJpsIdea" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJpsIdea" />
   <property name="mps_home" location="${basedir}" />
@@ -75,6 +77,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml b/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml
index 945d45228ac6..3e218997da82 100644
--- a/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml
+++ b/IdeaPlugin/mpsJpsIdeaJ8Compatibility.xml
@@ -1,6 +1,8 @@
 <project name="mpsJpsIdeaJ8Compatibility" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJpsIdeaJ8Compatibility" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJpsIdeaJ8Compatibility" />
   <property name="mps_home" location="${basedir}" />
@@ -79,6 +81,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsPlugin.xml b/IdeaPlugin/mpsPlugin.xml
index 7e30678639f6..1bd458093d03 100644
--- a/IdeaPlugin/mpsPlugin.xml
+++ b/IdeaPlugin/mpsPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPlugin" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -95,6 +97,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/IdeaPlugin/mpsPluginTests.xml b/IdeaPlugin/mpsPluginTests.xml
index 34a0c5689ddd..6c2d510a3091 100644
--- a/IdeaPlugin/mpsPluginTests.xml
+++ b/IdeaPlugin/mpsPluginTests.xml
@@ -1,6 +1,8 @@
 <project name="mpsPluginTests" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPluginTests" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPluginTests" />
   <property name="idea_home" location="" />
@@ -129,6 +131,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/build.xml b/build.xml
index 52f99d55c8a0..e8dba8567045 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,8 @@
 <project name="buildOfSampleJavaExtensions" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/buildOfSampleJavaExtensions" />
   <property name="build.layout" location="${build.dir}/artifacts/buildOfSampleJavaExtensions" />
   <property name="mps_home" location="${basedir}/../../../../../Applications/MPS 2023.3.app/Contents" />
@@ -789,6 +791,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -820,6 +824,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/jetpad.xml b/build/jetpad.xml
index 2f88bdf022dd..1239bc5d3284 100644
--- a/build/jetpad.xml
+++ b/build/jetpad.xml
@@ -1,6 +1,8 @@
 <project name="jetpad" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/jetpad" />
   <property name="build.layout" location="${build.dir}/artifacts/jetpad" />
   <property name="idea_home" location="" />
@@ -88,6 +90,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -113,6 +117,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsAntToolsPlugin.xml b/build/mpsAntToolsPlugin.xml
index 903802acc710..226816ef3789 100644
--- a/build/mpsAntToolsPlugin.xml
+++ b/build/mpsAntToolsPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsAntToolsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsAntToolsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsAntToolsPlugin" />
   <property name="idea_home" location="" />
@@ -102,6 +104,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -127,6 +131,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsBootstrapCore.xml b/build/mpsBootstrapCore.xml
index 51166ebe4e0e..eba0d31713ec 100644
--- a/build/mpsBootstrapCore.xml
+++ b/build/mpsBootstrapCore.xml
@@ -1,6 +1,8 @@
 <project name="mpsBootstrapCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBootstrapCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBootstrapCore" />
   <property name="version.major" value="2024" />
@@ -16723,6 +16725,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -16931,6 +16935,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsBuild.xml b/build/mpsBuild.xml
index a85839ccc585..17a1954c4f6f 100644
--- a/build/mpsBuild.xml
+++ b/build/mpsBuild.xml
@@ -1,6 +1,8 @@
 <project name="mpsBuild" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuild" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuild" />
   <property name="idea_home" location="" />
@@ -1592,6 +1594,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1632,6 +1636,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsBuildUI.xml b/build/mpsBuildUI.xml
index df2c9e75c2e4..08b690869d9d 100644
--- a/build/mpsBuildUI.xml
+++ b/build/mpsBuildUI.xml
@@ -1,6 +1,8 @@
 <project name="mpsBuildUI" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuildUI" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuildUI" />
   <property name="idea_home" location="" />
@@ -325,6 +327,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -364,6 +368,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsConsolePlugin.xml b/build/mpsConsolePlugin.xml
index e0f3aedd21f9..2bf752078a62 100644
--- a/build/mpsConsolePlugin.xml
+++ b/build/mpsConsolePlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsConsolePlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsConsolePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsConsolePlugin" />
   <property name="idea_home" location="" />
@@ -1095,6 +1097,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1136,6 +1140,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsContextActionsTool.xml b/build/mpsContextActionsTool.xml
index b47d0ced470f..1f7c3dc41d02 100644
--- a/build/mpsContextActionsTool.xml
+++ b/build/mpsContextActionsTool.xml
@@ -1,6 +1,8 @@
 <project name="mpsContextActionsTool" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsContextActionsTool" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsContextActionsTool" />
   <property name="idea_home" location="" />
@@ -339,6 +341,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -368,6 +372,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsCore.xml b/build/mpsCore.xml
index 0d698cdf786d..01d6b5c624b7 100644
--- a/build/mpsCore.xml
+++ b/build/mpsCore.xml
@@ -1,6 +1,8 @@
 <project name="mpsCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsCore" />
   <property name="idea_home" location="" />
@@ -1191,6 +1193,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1228,6 +1232,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsDebuggerPlugin.xml b/build/mpsDebuggerPlugin.xml
index 2d9ead0bf47e..68dc637e9351 100644
--- a/build/mpsDebuggerPlugin.xml
+++ b/build/mpsDebuggerPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsDebuggerPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDebuggerPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDebuggerPlugin" />
   <property name="idea_home" location="" />
@@ -1436,6 +1438,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1479,6 +1483,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsDevKit.xml b/build/mpsDevKit.xml
index 9a463067b6ae..4a977bb15cc7 100644
--- a/build/mpsDevKit.xml
+++ b/build/mpsDevKit.xml
@@ -1,6 +1,8 @@
 <project name="mpsDevKit" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDevKit" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDevKit" />
   <property name="idea_home" location="" />
@@ -992,6 +994,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1039,6 +1043,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsDiagramEditor.xml b/build/mpsDiagramEditor.xml
index 7d26d366720f..7c62de790caa 100644
--- a/build/mpsDiagramEditor.xml
+++ b/build/mpsDiagramEditor.xml
@@ -1,6 +1,8 @@
 <project name="mpsDiagramEditor" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDiagramEditor" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDiagramEditor" />
   <property name="idea_home" location="" />
@@ -540,6 +542,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -571,6 +575,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsExecutionPlugin.xml b/build/mpsExecutionPlugin.xml
index 2197cf485bb1..524f9ae803f9 100644
--- a/build/mpsExecutionPlugin.xml
+++ b/build/mpsExecutionPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsExecutionPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsExecutionPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsExecutionPlugin" />
   <property name="idea_home" location="" />
@@ -1102,6 +1104,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1152,6 +1156,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsHttpSupportPlugin.xml b/build/mpsHttpSupportPlugin.xml
index e12848ef833c..0599ed0a5ff2 100644
--- a/build/mpsHttpSupportPlugin.xml
+++ b/build/mpsHttpSupportPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsHttpSupportPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsHttpSupportPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsHttpSupportPlugin" />
   <property name="idea_home" location="" />
@@ -429,6 +431,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -463,6 +467,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsJava.xml b/build/mpsJava.xml
index e6d55a284e61..b4a29e10a1c7 100644
--- a/build/mpsJava.xml
+++ b/build/mpsJava.xml
@@ -1,6 +1,8 @@
 <project name="mpsJava" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJava" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJava" />
   <property name="mps_home" location="${basedir}" />
@@ -162,6 +164,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -190,6 +194,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/mpsJavaCore.xml b/build/mpsJavaCore.xml
index 90675a64f037..a984fc49f951 100644
--- a/build/mpsJavaCore.xml
+++ b/build/mpsJavaCore.xml
@@ -1,6 +1,8 @@
 <project name="mpsJavaCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaCore" />
   <property name="mps_home" location="${basedir}" />
@@ -138,6 +140,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -163,6 +167,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/mpsJavaPlatform.xml b/build/mpsJavaPlatform.xml
index 550ff90dce7e..199512b8f688 100644
--- a/build/mpsJavaPlatform.xml
+++ b/build/mpsJavaPlatform.xml
@@ -1,6 +1,8 @@
 <project name="mpsJavaPlatform" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaPlatform" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaPlatform" />
   <property name="mps_home" location="${basedir}" />
@@ -160,6 +162,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -186,6 +190,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/mpsKotlinPlugin.xml b/build/mpsKotlinPlugin.xml
index 72bc549d27e5..6fade950ad50 100644
--- a/build/mpsKotlinPlugin.xml
+++ b/build/mpsKotlinPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsKotlinPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsKotlinPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsKotlinPlugin" />
   <property name="idea_home" location="" />
@@ -1223,6 +1225,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1264,6 +1268,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsMakePlugin.xml b/build/mpsMakePlugin.xml
index ce0de13d0f5e..5de2e23a9783 100644
--- a/build/mpsMakePlugin.xml
+++ b/build/mpsMakePlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsMakePlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMakePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMakePlugin" />
   <property name="idea_home" location="" />
@@ -157,6 +159,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -185,6 +189,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsMigration.xml b/build/mpsMigration.xml
index 29d0b39819f2..e51721dfab78 100644
--- a/build/mpsMigration.xml
+++ b/build/mpsMigration.xml
@@ -1,6 +1,8 @@
 <project name="mpsMigration" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMigration" />
   <property name="idea_home" location="" />
@@ -333,6 +335,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -364,6 +368,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsMigrationCore.xml b/build/mpsMigrationCore.xml
index 93fd9e5ebea1..15abff940531 100644
--- a/build/mpsMigrationCore.xml
+++ b/build/mpsMigrationCore.xml
@@ -1,6 +1,8 @@
 <project name="mpsMigrationCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMigrationCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMigrationCore" />
   <property name="idea_home" location="" />
@@ -70,6 +72,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/build/mpsNavigationBar.xml b/build/mpsNavigationBar.xml
index d36b55aa27f5..d335f2971a9d 100644
--- a/build/mpsNavigationBar.xml
+++ b/build/mpsNavigationBar.xml
@@ -1,6 +1,8 @@
 <project name="mpsNavigationBar" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsNavigationBar" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsNavigationBar" />
   <property name="idea_home" location="" />
@@ -69,6 +71,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/build/mpsPlugins.xml b/build/mpsPlugins.xml
index a2af446f080d..7960086ac669 100644
--- a/build/mpsPlugins.xml
+++ b/build/mpsPlugins.xml
@@ -1,6 +1,8 @@
 <project name="mpsPlugins" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPlugins" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPlugins" />
   <property name="idea_home" location="" />
@@ -756,6 +758,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -796,6 +800,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsSpellCheckPlugin.xml b/build/mpsSpellCheckPlugin.xml
index 928722aa713e..b437fd85e29b 100644
--- a/build/mpsSpellCheckPlugin.xml
+++ b/build/mpsSpellCheckPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsSpellCheckPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsSpellCheckPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsSpellCheckPlugin" />
   <property name="idea_home" location="" />
@@ -120,6 +122,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -146,6 +150,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsStandalone.xml b/build/mpsStandalone.xml
index c6f88c8cc942..a997f653bef6 100644
--- a/build/mpsStandalone.xml
+++ b/build/mpsStandalone.xml
@@ -1,6 +1,8 @@
 <project name="mpsStandalone" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsStandalone" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsStandalone" />
   <property name="mps_home" location="${basedir}" />
@@ -115,6 +117,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/build/mpsTesting.xml b/build/mpsTesting.xml
index 2d76839e4d93..da7b72b88293 100644
--- a/build/mpsTesting.xml
+++ b/build/mpsTesting.xml
@@ -1,6 +1,8 @@
 <project name="mpsTesting" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTesting" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTesting" />
   <property name="idea_home" location="" />
@@ -1157,6 +1159,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1197,6 +1201,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsTooltips.xml b/build/mpsTooltips.xml
index 35307f31060a..32c5ad047641 100644
--- a/build/mpsTooltips.xml
+++ b/build/mpsTooltips.xml
@@ -1,6 +1,8 @@
 <project name="mpsTooltips" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTooltips" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTooltips" />
   <property name="idea_home" location="" />
@@ -266,6 +268,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -295,6 +299,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsTroveCollections.xml b/build/mpsTroveCollections.xml
index a9c2848f90c1..f64882f04c63 100644
--- a/build/mpsTroveCollections.xml
+++ b/build/mpsTroveCollections.xml
@@ -1,6 +1,8 @@
 <project name="mpsTroveCollections" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTroveCollections" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTroveCollections" />
   <property name="idea_home" location="" />
@@ -260,6 +262,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -288,6 +292,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsVcs.xml b/build/mpsVcs.xml
index 3b9d6230c5f0..eccb6ba18680 100644
--- a/build/mpsVcs.xml
+++ b/build/mpsVcs.xml
@@ -1,6 +1,8 @@
 <project name="mpsVcs" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVcs" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVcs" />
   <property name="idea_home" location="" />
@@ -744,6 +746,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -782,6 +786,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsVcsPlatform.xml b/build/mpsVcsPlatform.xml
index 849c8f29bceb..b10092ff2e43 100644
--- a/build/mpsVcsPlatform.xml
+++ b/build/mpsVcsPlatform.xml
@@ -1,6 +1,8 @@
 <project name="mpsVcsPlatform" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVcsPlatform" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVcsPlatform" />
   <property name="idea_home" location="" />
@@ -138,6 +140,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -153,6 +157,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/mpsWorkbench.xml b/build/mpsWorkbench.xml
index d6966c11d674..8b9c7a22c2d9 100644
--- a/build/mpsWorkbench.xml
+++ b/build/mpsWorkbench.xml
@@ -1,6 +1,8 @@
 <project name="mpsWorkbench" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsWorkbench" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsWorkbench" />
   <property name="idea_home" location="" />
@@ -363,6 +365,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -392,6 +396,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/build/tests/mpsActions.xml b/build/tests/mpsActions.xml
index 96c6b5b14754..5db8a565e485 100644
--- a/build/tests/mpsActions.xml
+++ b/build/tests/mpsActions.xml
@@ -161,6 +161,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsBaseLanguage.xml b/build/tests/mpsBaseLanguage.xml
index 253d7d18d66d..b14609e75cb7 100644
--- a/build/tests/mpsBaseLanguage.xml
+++ b/build/tests/mpsBaseLanguage.xml
@@ -926,6 +926,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsBehavior.xml b/build/tests/mpsBehavior.xml
index f02cb3e8b5d2..898654ceb131 100644
--- a/build/tests/mpsBehavior.xml
+++ b/build/tests/mpsBehavior.xml
@@ -722,6 +722,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsBuild.xml b/build/tests/mpsBuild.xml
index 6bc1c810ace3..144cb557c832 100644
--- a/build/tests/mpsBuild.xml
+++ b/build/tests/mpsBuild.xml
@@ -227,6 +227,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsConsole.xml b/build/tests/mpsConsole.xml
index f0fd4449e0aa..f5725acd94e8 100644
--- a/build/tests/mpsConsole.xml
+++ b/build/tests/mpsConsole.xml
@@ -189,6 +189,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsConstraints.xml b/build/tests/mpsConstraints.xml
index 432461979af0..2deeee04f2f1 100644
--- a/build/tests/mpsConstraints.xml
+++ b/build/tests/mpsConstraints.xml
@@ -466,6 +466,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsDataFlow.xml b/build/tests/mpsDataFlow.xml
index 6dbf35389415..17b46d761f3a 100644
--- a/build/tests/mpsDataFlow.xml
+++ b/build/tests/mpsDataFlow.xml
@@ -428,6 +428,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsEditor.xml b/build/tests/mpsEditor.xml
index 9410902c9b20..2bc19c2e3a5b 100644
--- a/build/tests/mpsEditor.xml
+++ b/build/tests/mpsEditor.xml
@@ -1700,6 +1700,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsEditorDiagram.xml b/build/tests/mpsEditorDiagram.xml
index d0584b8b608a..327446e3aab5 100644
--- a/build/tests/mpsEditorDiagram.xml
+++ b/build/tests/mpsEditorDiagram.xml
@@ -323,6 +323,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsEditorImageGen.xml b/build/tests/mpsEditorImageGen.xml
index 29030cbd4514..65d033230f41 100644
--- a/build/tests/mpsEditorImageGen.xml
+++ b/build/tests/mpsEditorImageGen.xml
@@ -304,6 +304,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
         <arg value="--add-opens=java.desktop/sun.font=ALL-UNNAMED" />
       </jvmargs>
diff --git a/build/tests/mpsEditorTransformationMenu.xml b/build/tests/mpsEditorTransformationMenu.xml
index abaa7727fe89..96349e3529b7 100644
--- a/build/tests/mpsEditorTransformationMenu.xml
+++ b/build/tests/mpsEditorTransformationMenu.xml
@@ -1669,6 +1669,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsExecution.xml b/build/tests/mpsExecution.xml
index 47d1592b663e..354e079df583 100644
--- a/build/tests/mpsExecution.xml
+++ b/build/tests/mpsExecution.xml
@@ -490,6 +490,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsFeedback.xml b/build/tests/mpsFeedback.xml
index e917bf908f5a..e7d870233aa7 100644
--- a/build/tests/mpsFeedback.xml
+++ b/build/tests/mpsFeedback.xml
@@ -256,6 +256,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsGenerator.xml b/build/tests/mpsGenerator.xml
index 1a83fccc298b..8de52acdf74e 100644
--- a/build/tests/mpsGenerator.xml
+++ b/build/tests/mpsGenerator.xml
@@ -1593,6 +1593,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsHttpSupport.xml b/build/tests/mpsHttpSupport.xml
index c54e24f94a9b..d6462cb089bb 100644
--- a/build/tests/mpsHttpSupport.xml
+++ b/build/tests/mpsHttpSupport.xml
@@ -181,6 +181,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsImplementationStripping.xml b/build/tests/mpsImplementationStripping.xml
index 281f00dd68a8..145fe66f7eb1 100644
--- a/build/tests/mpsImplementationStripping.xml
+++ b/build/tests/mpsImplementationStripping.xml
@@ -355,6 +355,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsJava.xml b/build/tests/mpsJava.xml
index 5e44009462c8..64ce2af0a878 100644
--- a/build/tests/mpsJava.xml
+++ b/build/tests/mpsJava.xml
@@ -225,6 +225,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsKotlin.xml b/build/tests/mpsKotlin.xml
index 89e7e16fdcf3..923ab034a224 100644
--- a/build/tests/mpsKotlin.xml
+++ b/build/tests/mpsKotlin.xml
@@ -252,6 +252,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsMigrations.xml b/build/tests/mpsMigrations.xml
index b6978a460f18..625a1931cfa3 100644
--- a/build/tests/mpsMigrations.xml
+++ b/build/tests/mpsMigrations.xml
@@ -154,6 +154,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsPackaged.xml b/build/tests/mpsPackaged.xml
index 9484a543c4d2..d0ac9a88a272 100644
--- a/build/tests/mpsPackaged.xml
+++ b/build/tests/mpsPackaged.xml
@@ -267,6 +267,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsSModel.xml b/build/tests/mpsSModel.xml
index 107d922d35f8..b57f4f03298d 100644
--- a/build/tests/mpsSModel.xml
+++ b/build/tests/mpsSModel.xml
@@ -403,6 +403,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsSmartRefAttrMigration_gen.xml b/build/tests/mpsSmartRefAttrMigration_gen.xml
index 1797b022168a..23b981347741 100644
--- a/build/tests/mpsSmartRefAttrMigration_gen.xml
+++ b/build/tests/mpsSmartRefAttrMigration_gen.xml
@@ -160,6 +160,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsTest.xml b/build/tests/mpsTest.xml
index 96eeed534e95..ef6170c3cca3 100644
--- a/build/tests/mpsTest.xml
+++ b/build/tests/mpsTest.xml
@@ -1128,6 +1128,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsTestModules.xml b/build/tests/mpsTestModules.xml
index b3873480831f..a39c715ee6e8 100644
--- a/build/tests/mpsTestModules.xml
+++ b/build/tests/mpsTestModules.xml
@@ -510,6 +510,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsTestRefactoring.xml b/build/tests/mpsTestRefactoring.xml
index 64f6f7b2ac9a..56a10d88d0f7 100644
--- a/build/tests/mpsTestRefactoring.xml
+++ b/build/tests/mpsTestRefactoring.xml
@@ -203,6 +203,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsText.xml b/build/tests/mpsText.xml
index 339ee7c13b16..84052913c468 100644
--- a/build/tests/mpsText.xml
+++ b/build/tests/mpsText.xml
@@ -153,6 +153,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsToolTests.xml b/build/tests/mpsToolTests.xml
index 02adc4c55e4a..a0b3d5158ad4 100644
--- a/build/tests/mpsToolTests.xml
+++ b/build/tests/mpsToolTests.xml
@@ -218,6 +218,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsTypesystem.xml b/build/tests/mpsTypesystem.xml
index 3dbfa4f8a712..f91406348266 100644
--- a/build/tests/mpsTypesystem.xml
+++ b/build/tests/mpsTypesystem.xml
@@ -975,6 +975,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/build/tests/mpsVCS.xml b/build/tests/mpsVCS.xml
index 93c972b4560e..f8a43f3f6a17 100644
--- a/build/tests/mpsVCS.xml
+++ b/build/tests/mpsVCS.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVCS" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVCS" />
   <property name="mps_home" location="${basedir}" />
@@ -89,6 +91,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -118,6 +122,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml
index 5bd03eac0c52..c69131d08ca9 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest.xml
@@ -1,6 +1,8 @@
 <project name="buildTest" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/buildTest" />
   <property name="build.layout" location="${build.dir}/artifacts/buildTest" />
   <property name="artifacts.mps" location="../../../build/artifacts/mps" />
@@ -117,6 +119,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -144,6 +148,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml
index 1cf6856241e6..5aefe9fbbb3e 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/buildTest/buildTest2.xml
@@ -1,6 +1,8 @@
 <project name="buildTest2" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/buildTest2" />
   <property name="build.layout" location="${build.dir}/artifacts/buildTest2" />
   <property name="artifacts.mps" location="../../../build/artifacts/mps" />
@@ -137,6 +139,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -163,6 +167,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml
index 4160989d8536..baf564949606 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/samples/stripImpl/build.xml
@@ -1,6 +1,8 @@
 <project name="buildPlugin" default="build" basedir="../../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/buildPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/buildPlugin" />
   <property name="artifacts.mps" location="../../build/artifacts/mps" />
@@ -201,6 +203,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -230,6 +234,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml
index 4160989d8536..baf564949606 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/buildPlugin.xml
@@ -1,6 +1,8 @@
 <project name="buildPlugin" default="build" basedir="../../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/buildPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/buildPlugin" />
   <property name="artifacts.mps" location="../../build/artifacts/mps" />
@@ -201,6 +203,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -230,6 +234,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info
index f429a35c9513..8d41bfd95683 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/stripImplementation/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root nodeRef="r:02e26212-728e-46cb-bbf3-c544990b3781(jetbrains.mps.build.sandbox.stripImplementation)/3389822811992714254">
     <file name="buildPlugin.xml">
-      <unit id="3389822811992714254" at="1,0,452,10" name="jetbrains.mps.build.sandbox.stripImplementation.buildPlugin" />
+      <unit id="3389822811992714254" at="1,0,458,10" name="jetbrains.mps.build.sandbox.stripImplementation.buildPlugin" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml
index 5bd03eac0c52..c69131d08ca9 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest.xml
@@ -1,6 +1,8 @@
 <project name="buildTest" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/buildTest" />
   <property name="build.layout" location="${build.dir}/artifacts/buildTest" />
   <property name="artifacts.mps" location="../../../build/artifacts/mps" />
@@ -117,6 +119,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -144,6 +148,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml
index 1cf6856241e6..5aefe9fbbb3e 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/buildTest2.xml
@@ -1,6 +1,8 @@
 <project name="buildTest2" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/buildTest2" />
   <property name="build.layout" location="${build.dir}/artifacts/buildTest2" />
   <property name="artifacts.mps" location="../../../build/artifacts/mps" />
@@ -137,6 +139,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -163,6 +167,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
     </generate>
diff --git a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info
index 8c12e952f2a8..91e87ed3fe7c 100644
--- a/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info
+++ b/plugins/mps-build/solutions/jetbrains.mps.build.sandbox/source_gen/jetbrains/mps/build/sandbox/testExternalBuild/trace.info
@@ -2,12 +2,12 @@
 <debug-info version="2">
   <root nodeRef="r:911b64be-e838-4b67-bbec-bce1a5b0b287(jetbrains.mps.build.sandbox.testExternalBuild)/8056730377013685541">
     <file name="buildTest.xml">
-      <unit id="8056730377013685541" at="1,0,289,10" name="jetbrains.mps.build.sandbox.testExternalBuild.buildTest" />
+      <unit id="8056730377013685541" at="1,0,295,10" name="jetbrains.mps.build.sandbox.testExternalBuild.buildTest" />
     </file>
   </root>
   <root nodeRef="r:911b64be-e838-4b67-bbec-bce1a5b0b287(jetbrains.mps.build.sandbox.testExternalBuild)/8077978191914979020">
     <file name="buildTest2.xml">
-      <unit id="8077978191914979020" at="1,0,308,10" name="jetbrains.mps.build.sandbox.testExternalBuild.buildTest2" />
+      <unit id="8077978191914979020" at="1,0,314,10" name="jetbrains.mps.build.sandbox.testExternalBuild.buildTest2" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml
index 2f88bdf022dd..1239bc5d3284 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/jetpad.xml
@@ -1,6 +1,8 @@
 <project name="jetpad" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/jetpad" />
   <property name="build.layout" location="${build.dir}/artifacts/jetpad" />
   <property name="idea_home" location="" />
@@ -88,6 +90,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -113,6 +117,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml
index 903802acc710..226816ef3789 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsAntToolsPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsAntToolsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsAntToolsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsAntToolsPlugin" />
   <property name="idea_home" location="" />
@@ -102,6 +104,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -127,6 +131,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
index 51166ebe4e0e..eba0d31713ec 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
@@ -1,6 +1,8 @@
 <project name="mpsBootstrapCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBootstrapCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBootstrapCore" />
   <property name="version.major" value="2024" />
@@ -16723,6 +16725,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -16931,6 +16935,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml
index a85839ccc585..17a1954c4f6f 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuild.xml
@@ -1,6 +1,8 @@
 <project name="mpsBuild" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuild" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuild" />
   <property name="idea_home" location="" />
@@ -1592,6 +1594,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1632,6 +1636,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml
index df2c9e75c2e4..08b690869d9d 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBuildUI.xml
@@ -1,6 +1,8 @@
 <project name="mpsBuildUI" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBuildUI" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBuildUI" />
   <property name="idea_home" location="" />
@@ -325,6 +327,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -364,6 +368,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml
index e0f3aedd21f9..2bf752078a62 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsConsolePlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsConsolePlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsConsolePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsConsolePlugin" />
   <property name="idea_home" location="" />
@@ -1095,6 +1097,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1136,6 +1140,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml
index b47d0ced470f..1f7c3dc41d02 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsContextActionsTool.xml
@@ -1,6 +1,8 @@
 <project name="mpsContextActionsTool" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsContextActionsTool" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsContextActionsTool" />
   <property name="idea_home" location="" />
@@ -339,6 +341,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -368,6 +372,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml
index 0d698cdf786d..01d6b5c624b7 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml
@@ -1,6 +1,8 @@
 <project name="mpsCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsCore" />
   <property name="idea_home" location="" />
@@ -1191,6 +1193,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1228,6 +1232,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml
index 2d9ead0bf47e..68dc637e9351 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDebuggerPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsDebuggerPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDebuggerPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDebuggerPlugin" />
   <property name="idea_home" location="" />
@@ -1436,6 +1438,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1479,6 +1483,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml
index 9a463067b6ae..4a977bb15cc7 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDevKit.xml
@@ -1,6 +1,8 @@
 <project name="mpsDevKit" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDevKit" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDevKit" />
   <property name="idea_home" location="" />
@@ -992,6 +994,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1039,6 +1043,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml
index 7d26d366720f..7c62de790caa 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsDiagramEditor.xml
@@ -1,6 +1,8 @@
 <project name="mpsDiagramEditor" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsDiagramEditor" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsDiagramEditor" />
   <property name="idea_home" location="" />
@@ -540,6 +542,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -571,6 +575,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml
index 2197cf485bb1..524f9ae803f9 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsExecutionPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsExecutionPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsExecutionPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsExecutionPlugin" />
   <property name="idea_home" location="" />
@@ -1102,6 +1104,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1152,6 +1156,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml
index e12848ef833c..0599ed0a5ff2 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsHttpSupportPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsHttpSupportPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsHttpSupportPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsHttpSupportPlugin" />
   <property name="idea_home" location="" />
@@ -429,6 +431,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -463,6 +467,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml
index e6d55a284e61..b4a29e10a1c7 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJava.xml
@@ -1,6 +1,8 @@
 <project name="mpsJava" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJava" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJava" />
   <property name="mps_home" location="${basedir}" />
@@ -162,6 +164,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -190,6 +194,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml
index 90675a64f037..a984fc49f951 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaCore.xml
@@ -1,6 +1,8 @@
 <project name="mpsJavaCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaCore" />
   <property name="mps_home" location="${basedir}" />
@@ -138,6 +140,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -163,6 +167,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml
index 550ff90dce7e..199512b8f688 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsJavaPlatform.xml
@@ -1,6 +1,8 @@
 <project name="mpsJavaPlatform" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaPlatform" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaPlatform" />
   <property name="mps_home" location="${basedir}" />
@@ -160,6 +162,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -186,6 +190,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml
index 72bc549d27e5..6fade950ad50 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsKotlinPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsKotlinPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsKotlinPlugin" />
   <property name="idea_home" location="" />
@@ -1223,6 +1225,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1264,6 +1268,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml
index ce0de13d0f5e..5de2e23a9783 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMakePlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsMakePlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMakePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMakePlugin" />
   <property name="idea_home" location="" />
@@ -157,6 +159,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -185,6 +189,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml
index 29d0b39819f2..e51721dfab78 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigration.xml
@@ -1,6 +1,8 @@
 <project name="mpsMigration" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMigration" />
   <property name="idea_home" location="" />
@@ -333,6 +335,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -364,6 +368,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml
index 93fd9e5ebea1..15abff940531 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsMigrationCore.xml
@@ -1,6 +1,8 @@
 <project name="mpsMigrationCore" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsMigrationCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsMigrationCore" />
   <property name="idea_home" location="" />
@@ -70,6 +72,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml
index d36b55aa27f5..d335f2971a9d 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsNavigationBar.xml
@@ -1,6 +1,8 @@
 <project name="mpsNavigationBar" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsNavigationBar" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsNavigationBar" />
   <property name="idea_home" location="" />
@@ -69,6 +71,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml
index a2af446f080d..7960086ac669 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml
@@ -1,6 +1,8 @@
 <project name="mpsPlugins" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPlugins" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPlugins" />
   <property name="idea_home" location="" />
@@ -756,6 +758,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -796,6 +800,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml
index 928722aa713e..b437fd85e29b 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsSpellCheckPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsSpellCheckPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsSpellCheckPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsSpellCheckPlugin" />
   <property name="idea_home" location="" />
@@ -120,6 +122,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -146,6 +150,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml
index c6f88c8cc942..a997f653bef6 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsStandalone.xml
@@ -1,6 +1,8 @@
 <project name="mpsStandalone" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsStandalone" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsStandalone" />
   <property name="mps_home" location="${basedir}" />
@@ -115,6 +117,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
index 2d76839e4d93..da7b72b88293 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTesting.xml
@@ -1,6 +1,8 @@
 <project name="mpsTesting" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTesting" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTesting" />
   <property name="idea_home" location="" />
@@ -1157,6 +1159,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -1197,6 +1201,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml
index 35307f31060a..32c5ad047641 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTooltips.xml
@@ -1,6 +1,8 @@
 <project name="mpsTooltips" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTooltips" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTooltips" />
   <property name="idea_home" location="" />
@@ -266,6 +268,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -295,6 +299,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml
index a9c2848f90c1..f64882f04c63 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsTroveCollections.xml
@@ -1,6 +1,8 @@
 <project name="mpsTroveCollections" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsTroveCollections" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsTroveCollections" />
   <property name="idea_home" location="" />
@@ -260,6 +262,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -288,6 +292,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml
index 3b9d6230c5f0..eccb6ba18680 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcs.xml
@@ -1,6 +1,8 @@
 <project name="mpsVcs" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVcs" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVcs" />
   <property name="idea_home" location="" />
@@ -744,6 +746,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -782,6 +786,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml
index 849c8f29bceb..b10092ff2e43 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsVcsPlatform.xml
@@ -1,6 +1,8 @@
 <project name="mpsVcsPlatform" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVcsPlatform" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVcsPlatform" />
   <property name="idea_home" location="" />
@@ -138,6 +140,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -153,6 +157,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml
index d6966c11d674..8b9c7a22c2d9 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsWorkbench.xml
@@ -1,6 +1,8 @@
 <project name="mpsWorkbench" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsWorkbench" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsWorkbench" />
   <property name="idea_home" location="" />
@@ -363,6 +365,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -392,6 +396,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml
index b3873480831f..a39c715ee6e8 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml
@@ -510,6 +510,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestRefactoring.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestRefactoring.xml
index 64f6f7b2ac9a..56a10d88d0f7 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestRefactoring.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestRefactoring.xml
@@ -203,6 +203,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info
index 39be3469ab19..8882d34b207f 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/trace.info
@@ -2,12 +2,12 @@
 <debug-info version="2">
   <root nodeRef="r:12897c41-1d23-444a-8c3d-8a254e74f9b6(jetbrains.mps.ide.build.tests.generatedTests)/8806036443185005266">
     <file name="mpsTestModules.xml">
-      <unit id="8806036443185005266" at="1,0,1096,10" name="jetbrains.mps.ide.build.tests.generatedTests.mpsTestModules" />
+      <unit id="8806036443185005266" at="1,0,1098,10" name="jetbrains.mps.ide.build.tests.generatedTests.mpsTestModules" />
     </file>
   </root>
   <root nodeRef="r:12897c41-1d23-444a-8c3d-8a254e74f9b6(jetbrains.mps.ide.build.tests.generatedTests)/8806036443185005938">
     <file name="mpsTestRefactoring.xml">
-      <unit id="8806036443185005938" at="1,0,363,10" name="jetbrains.mps.ide.build.tests.generatedTests.mpsTestRefactoring" />
+      <unit id="8806036443185005938" at="1,0,365,10" name="jetbrains.mps.ide.build.tests.generatedTests.mpsTestRefactoring" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml
index 96c6b5b14754..5db8a565e485 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml
@@ -161,6 +161,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml
index 253d7d18d66d..b14609e75cb7 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml
@@ -926,6 +926,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml
index f02cb3e8b5d2..898654ceb131 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml
@@ -722,6 +722,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml
index 6bc1c810ace3..144cb557c832 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml
@@ -227,6 +227,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml
index f0fd4449e0aa..f5725acd94e8 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConsole.xml
@@ -189,6 +189,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml
index 432461979af0..2deeee04f2f1 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsConstraints.xml
@@ -466,6 +466,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml
index 6dbf35389415..17b46d761f3a 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml
@@ -428,6 +428,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml
index 9410902c9b20..2bc19c2e3a5b 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml
@@ -1700,6 +1700,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml
index d0584b8b608a..327446e3aab5 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml
@@ -323,6 +323,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml
index 29030cbd4514..65d033230f41 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml
@@ -304,6 +304,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
         <arg value="--add-opens=java.desktop/sun.font=ALL-UNNAMED" />
       </jvmargs>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml
index abaa7727fe89..96349e3529b7 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorTransformationMenu.xml
@@ -1669,6 +1669,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml
index 47d1592b663e..354e079df583 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml
@@ -490,6 +490,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml
index e917bf908f5a..e7d870233aa7 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsFeedback.xml
@@ -256,6 +256,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml
index 1a83fccc298b..8de52acdf74e 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml
@@ -1593,6 +1593,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
index c54e24f94a9b..d6462cb089bb 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsHttpSupport.xml
@@ -181,6 +181,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml
index 281f00dd68a8..145fe66f7eb1 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml
@@ -355,6 +355,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml
index 5e44009462c8..64ce2af0a878 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsJava.xml
@@ -225,6 +225,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml
index 89e7e16fdcf3..923ab034a224 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsKotlin.xml
@@ -252,6 +252,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsMigrations.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsMigrations.xml
index b6978a460f18..625a1931cfa3 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsMigrations.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsMigrations.xml
@@ -154,6 +154,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml
index 9484a543c4d2..d0ac9a88a272 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml
@@ -267,6 +267,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
index 107d922d35f8..b57f4f03298d 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
@@ -403,6 +403,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml
index 1797b022168a..23b981347741 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSmartRefAttrMigration.xml
@@ -160,6 +160,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml
index 96eeed534e95..ef6170c3cca3 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTest.xml
@@ -1128,6 +1128,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml
index 339ee7c13b16..84052913c468 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsText.xml
@@ -153,6 +153,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml
index 02adc4c55e4a..a0b3d5158ad4 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsToolTests.xml
@@ -218,6 +218,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml
index 3dbfa4f8a712..f91406348266 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsTypesystem.xml
@@ -975,6 +975,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml
index 93c972b4560e..f8a43f3f6a17 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsVCS.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsVCS" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsVCS" />
   <property name="mps_home" location="${basedir}" />
@@ -89,6 +91,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -118,6 +122,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
index 301bf213bfdd..d13bff2892cf 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/trace.info
@@ -2,137 +2,137 @@
 <debug-info version="2">
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/141865155246494254">
     <file name="mpsDataFlow.xml">
-      <unit id="141865155246494254" at="1,0,808,10" name="jetbrains.mps.ide.build.tests.mpsDataFlow" />
+      <unit id="141865155246494254" at="1,0,810,10" name="jetbrains.mps.ide.build.tests.mpsDataFlow" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/1889888958307906528">
     <file name="mpsKotlin.xml">
-      <unit id="1889888958307906528" at="1,0,488,10" name="jetbrains.mps.ide.build.tests.mpsKotlin" />
+      <unit id="1889888958307906528" at="1,0,490,10" name="jetbrains.mps.ide.build.tests.mpsKotlin" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2085316548396374793">
     <file name="mpsImplementationStripping.xml">
-      <unit id="2085316548396374793" at="1,0,700,10" name="jetbrains.mps.ide.build.tests.mpsImplementationStripping" />
+      <unit id="2085316548396374793" at="1,0,702,10" name="jetbrains.mps.ide.build.tests.mpsImplementationStripping" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2201735946498405745">
     <file name="mpsTypesystem.xml">
-      <unit id="2201735946498405745" at="1,0,1795,10" name="jetbrains.mps.ide.build.tests.mpsTypesystem" />
+      <unit id="2201735946498405745" at="1,0,1797,10" name="jetbrains.mps.ide.build.tests.mpsTypesystem" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/2883693069523015134">
     <file name="mpsConstraints.xml">
-      <unit id="2883693069523015134" at="1,0,917,10" name="jetbrains.mps.ide.build.tests.mpsConstraints" />
+      <unit id="2883693069523015134" at="1,0,919,10" name="jetbrains.mps.ide.build.tests.mpsConstraints" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3071492597344792659">
     <file name="mpsFeedback.xml">
-      <unit id="3071492597344792659" at="1,0,476,10" name="jetbrains.mps.ide.build.tests.mpsFeedback" />
+      <unit id="3071492597344792659" at="1,0,478,10" name="jetbrains.mps.ide.build.tests.mpsFeedback" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3197190366568000187">
     <file name="mpsBuild.xml">
-      <unit id="3197190366568000187" at="1,0,456,10" name="jetbrains.mps.ide.build.tests.mpsBuild" />
+      <unit id="3197190366568000187" at="1,0,458,10" name="jetbrains.mps.ide.build.tests.mpsBuild" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3474133302908391407">
     <file name="mpsExecution.xml">
-      <unit id="3474133302908391407" at="1,0,1024,10" name="jetbrains.mps.ide.build.tests.mpsExecution" />
+      <unit id="3474133302908391407" at="1,0,1026,10" name="jetbrains.mps.ide.build.tests.mpsExecution" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/3856853424911912638">
     <file name="mpsEditorImageGen.xml">
-      <unit id="3856853424911912638" at="1,0,574,10" name="jetbrains.mps.ide.build.tests.mpsEditorImageGen" />
+      <unit id="3856853424911912638" at="1,0,576,10" name="jetbrains.mps.ide.build.tests.mpsEditorImageGen" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4074183641147971049">
     <file name="mpsSModel.xml">
-      <unit id="4074183641147971049" at="1,0,895,10" name="jetbrains.mps.ide.build.tests.mpsSModel" />
+      <unit id="4074183641147971049" at="1,0,897,10" name="jetbrains.mps.ide.build.tests.mpsSModel" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/4286050570470716727">
     <file name="mpsText.xml">
-      <unit id="4286050570470716727" at="1,0,293,10" name="jetbrains.mps.ide.build.tests.mpsText" />
+      <unit id="4286050570470716727" at="1,0,295,10" name="jetbrains.mps.ide.build.tests.mpsText" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5003005296035786909">
     <file name="mpsEditorDiagram.xml">
-      <unit id="5003005296035786909" at="1,0,653,10" name="jetbrains.mps.ide.build.tests.mpsEditorDiagram" />
+      <unit id="5003005296035786909" at="1,0,655,10" name="jetbrains.mps.ide.build.tests.mpsEditorDiagram" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5332690376493680136">
     <file name="mpsSmartRefAttrMigration.xml">
-      <unit id="5332690376493680136" at="1,0,300,10" name="jetbrains.mps.ide.build.tests.mpsSmartRefAttrMigration" />
+      <unit id="5332690376493680136" at="1,0,302,10" name="jetbrains.mps.ide.build.tests.mpsSmartRefAttrMigration" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5624877018229105292">
     <file name="mpsEditorTransformationMenu.xml">
-      <unit id="5624877018229105292" at="1,0,3225,10" name="jetbrains.mps.ide.build.tests.mpsEditorTransformationMenu" />
+      <unit id="5624877018229105292" at="1,0,3227,10" name="jetbrains.mps.ide.build.tests.mpsEditorTransformationMenu" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5764338631358318306">
     <file name="mpsMigrations.xml">
-      <unit id="5764338631358318306" at="1,0,289,10" name="jetbrains.mps.ide.build.tests.mpsMigrations" />
+      <unit id="5764338631358318306" at="1,0,291,10" name="jetbrains.mps.ide.build.tests.mpsMigrations" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5833628797344916224">
     <file name="mpsEditor.xml">
-      <unit id="5833628797344916224" at="1,0,3401,10" name="jetbrains.mps.ide.build.tests.mpsEditor" />
+      <unit id="5833628797344916224" at="1,0,3403,10" name="jetbrains.mps.ide.build.tests.mpsEditor" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/5973657458022229901">
     <file name="mpsPackaged.xml">
-      <unit id="5973657458022229901" at="1,0,483,10" name="jetbrains.mps.ide.build.tests.mpsPackaged" />
+      <unit id="5973657458022229901" at="1,0,485,10" name="jetbrains.mps.ide.build.tests.mpsPackaged" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6147098677962246363">
     <file name="mpsHttpSupport.xml">
-      <unit id="6147098677962246363" at="1,0,383,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
+      <unit id="6147098677962246363" at="1,0,385,10" name="jetbrains.mps.ide.build.tests.mpsHttpSupport" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353312053">
     <file name="mpsGenerator.xml">
-      <unit id="617882099353312053" at="1,0,3180,10" name="jetbrains.mps.ide.build.tests.mpsGenerator" />
+      <unit id="617882099353312053" at="1,0,3182,10" name="jetbrains.mps.ide.build.tests.mpsGenerator" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/617882099353331886">
     <file name="mpsJava.xml">
-      <unit id="617882099353331886" at="1,0,401,10" name="jetbrains.mps.ide.build.tests.mpsJava" />
+      <unit id="617882099353331886" at="1,0,403,10" name="jetbrains.mps.ide.build.tests.mpsJava" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6238501899265293051">
     <file name="mpsActions.xml">
-      <unit id="6238501899265293051" at="1,0,301,10" name="jetbrains.mps.ide.build.tests.mpsActions" />
+      <unit id="6238501899265293051" at="1,0,303,10" name="jetbrains.mps.ide.build.tests.mpsActions" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/6390717532282583654">
     <file name="mpsVCS.xml">
-      <unit id="6390717532282583654" at="1,0,209,10" name="jetbrains.mps.ide.build.tests.mpsVCS" />
+      <unit id="6390717532282583654" at="1,0,215,10" name="jetbrains.mps.ide.build.tests.mpsVCS" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7210153263370654627">
     <file name="mpsBaseLanguage.xml">
-      <unit id="7210153263370654627" at="1,0,1964,10" name="jetbrains.mps.ide.build.tests.mpsBaseLanguage" />
+      <unit id="7210153263370654627" at="1,0,1966,10" name="jetbrains.mps.ide.build.tests.mpsBaseLanguage" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7438002853058266164">
     <file name="mpsBehavior.xml">
-      <unit id="7438002853058266164" at="1,0,1270,10" name="jetbrains.mps.ide.build.tests.mpsBehavior" />
+      <unit id="7438002853058266164" at="1,0,1272,10" name="jetbrains.mps.ide.build.tests.mpsBehavior" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/7763823021514561033">
     <file name="mpsTest.xml">
-      <unit id="7763823021514561033" at="1,0,2333,10" name="jetbrains.mps.ide.build.tests.mpsTest" />
+      <unit id="7763823021514561033" at="1,0,2335,10" name="jetbrains.mps.ide.build.tests.mpsTest" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/9064011936883918541">
     <file name="mpsToolTests.xml">
-      <unit id="9064011936883918541" at="1,0,487,10" name="jetbrains.mps.ide.build.tests.mpsToolTests" />
+      <unit id="9064011936883918541" at="1,0,489,10" name="jetbrains.mps.ide.build.tests.mpsToolTests" />
     </file>
   </root>
   <root nodeRef="r:42d04941-551b-420d-9485-a5f496e15594(jetbrains.mps.ide.build.tests)/9219004022556570565">
     <file name="mpsConsole.xml">
-      <unit id="9219004022556570565" at="1,0,392,10" name="jetbrains.mps.ide.build.tests.mpsConsole" />
+      <unit id="9219004022556570565" at="1,0,394,10" name="jetbrains.mps.ide.build.tests.mpsConsole" />
     </file>
   </root>
 </debug-info>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info
index dcf8ef6e9678..7f48d691211a 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info
@@ -2,47 +2,47 @@
 <debug-info version="2">
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1392391688312941958">
     <file name="mpsStandalone.xml">
-      <unit id="1392391688312941958" at="1,0,137,10" name="jetbrains.mps.ide.build.mpsStandalone" />
+      <unit id="1392391688312941958" at="1,0,141,10" name="jetbrains.mps.ide.build.mpsStandalone" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1432730276628307864">
     <file name="mpsKotlinPlugin.xml">
-      <unit id="1432730276628307864" at="1,0,2226,10" name="jetbrains.mps.ide.build.mpsKotlinPlugin" />
+      <unit id="1432730276628307864" at="1,0,2232,10" name="jetbrains.mps.ide.build.mpsKotlinPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1545517825663017278">
     <file name="mpsVcs.xml">
-      <unit id="1545517825663017278" at="1,0,1176,10" name="jetbrains.mps.ide.build.mpsVcs" />
+      <unit id="1545517825663017278" at="1,0,1182,10" name="jetbrains.mps.ide.build.mpsVcs" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/1583398502926411284">
     <file name="mpsAntToolsPlugin.xml">
-      <unit id="1583398502926411284" at="1,0,192,10" name="jetbrains.mps.ide.build.mpsAntToolsPlugin" />
+      <unit id="1583398502926411284" at="1,0,198,10" name="jetbrains.mps.ide.build.mpsAntToolsPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2002671966457711287">
     <file name="mpsContextActionsTool.xml">
-      <unit id="2002671966457711287" at="1,0,677,10" name="jetbrains.mps.ide.build.mpsContextActionsTool" />
+      <unit id="2002671966457711287" at="1,0,683,10" name="jetbrains.mps.ide.build.mpsContextActionsTool" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2405506926871158265">
     <file name="jetpad.xml">
-      <unit id="2405506926871158265" at="1,0,141,10" name="jetbrains.mps.ide.build.jetpad" />
+      <unit id="2405506926871158265" at="1,0,147,10" name="jetbrains.mps.ide.build.jetpad" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2569834391839970845">
     <file name="mpsWorkbench.xml">
-      <unit id="2569834391839970845" at="1,0,733,10" name="jetbrains.mps.ide.build.mpsWorkbench" />
+      <unit id="2569834391839970845" at="1,0,739,10" name="jetbrains.mps.ide.build.mpsWorkbench" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/2849781404939735115">
     <file name="mpsJavaCore.xml">
-      <unit id="2849781404939735115" at="1,0,250,10" name="jetbrains.mps.ide.build.mpsJavaCore" />
+      <unit id="2849781404939735115" at="1,0,256,10" name="jetbrains.mps.ide.build.mpsJavaCore" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4218078887717256532">
     <file name="mpsConsolePlugin.xml">
-      <unit id="4218078887717256532" at="1,0,2153,10" name="jetbrains.mps.ide.build.mpsConsolePlugin" />
+      <unit id="4218078887717256532" at="1,0,2159,10" name="jetbrains.mps.ide.build.mpsConsolePlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4301118715654192646">
@@ -57,57 +57,57 @@
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4301118715654819483">
     <file name="mpsTroveCollections.xml">
-      <unit id="4301118715654819483" at="1,0,432,10" name="jetbrains.mps.ide.build.mpsTroveCollections" />
+      <unit id="4301118715654819483" at="1,0,438,10" name="jetbrains.mps.ide.build.mpsTroveCollections" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4305752832749937830">
     <file name="mpsDiagramEditor.xml">
-      <unit id="4305752832749937830" at="1,0,1122,10" name="jetbrains.mps.ide.build.mpsDiagramEditor" />
+      <unit id="4305752832749937830" at="1,0,1128,10" name="jetbrains.mps.ide.build.mpsDiagramEditor" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/4481132555457191249">
     <file name="mpsSpellCheckPlugin.xml">
-      <unit id="4481132555457191249" at="1,0,235,10" name="jetbrains.mps.ide.build.mpsSpellCheckPlugin" />
+      <unit id="4481132555457191249" at="1,0,241,10" name="jetbrains.mps.ide.build.mpsSpellCheckPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/5412100053808926057">
     <file name="mpsNavigationBar.xml">
-      <unit id="5412100053808926057" at="1,0,142,10" name="jetbrains.mps.ide.build.mpsNavigationBar" />
+      <unit id="5412100053808926057" at="1,0,146,10" name="jetbrains.mps.ide.build.mpsNavigationBar" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/5548512857136492214">
     <file name="mpsDevKit.xml">
-      <unit id="5548512857136492214" at="1,0,2059,10" name="jetbrains.mps.ide.build.mpsDevKit" />
+      <unit id="5548512857136492214" at="1,0,2065,10" name="jetbrains.mps.ide.build.mpsDevKit" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6164334420696839314">
     <file name="mpsDebuggerPlugin.xml">
-      <unit id="6164334420696839314" at="1,0,2457,10" name="jetbrains.mps.ide.build.mpsDebuggerPlugin" />
+      <unit id="6164334420696839314" at="1,0,2463,10" name="jetbrains.mps.ide.build.mpsDebuggerPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/618786790401812237">
     <file name="mpsTesting.xml">
-      <unit id="618786790401812237" at="1,0,2369,10" name="jetbrains.mps.ide.build.mpsTesting" />
+      <unit id="618786790401812237" at="1,0,2375,10" name="jetbrains.mps.ide.build.mpsTesting" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6265574260762011003">
     <file name="mpsMakePlugin.xml">
-      <unit id="6265574260762011003" at="1,0,282,10" name="jetbrains.mps.ide.build.mpsMakePlugin" />
+      <unit id="6265574260762011003" at="1,0,288,10" name="jetbrains.mps.ide.build.mpsMakePlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6361939271669846483">
     <file name="mpsExecutionPlugin.xml">
-      <unit id="6361939271669846483" at="1,0,2191,10" name="jetbrains.mps.ide.build.mpsExecutionPlugin" />
+      <unit id="6361939271669846483" at="1,0,2197,10" name="jetbrains.mps.ide.build.mpsExecutionPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6391307088354381121">
     <file name="mpsPlugins.xml">
-      <unit id="6391307088354381121" at="1,0,1560,10" name="jetbrains.mps.ide.build.mpsPlugins" />
+      <unit id="6391307088354381121" at="1,0,1566,10" name="jetbrains.mps.ide.build.mpsPlugins" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/6503539749405386437">
     <file name="mpsCore.xml">
-      <unit id="6503539749405386437" at="1,0,2224,10" name="jetbrains.mps.ide.build.mpsCore" />
+      <unit id="6503539749405386437" at="1,0,2230,10" name="jetbrains.mps.ide.build.mpsCore" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/716066598061903713">
@@ -117,7 +117,7 @@
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7246064732104303799">
     <file name="mpsVcsPlatform.xml">
-      <unit id="7246064732104303799" at="1,0,283,10" name="jetbrains.mps.ide.build.mpsVcsPlatform" />
+      <unit id="7246064732104303799" at="1,0,289,10" name="jetbrains.mps.ide.build.mpsVcsPlatform" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7352975819312388027">
@@ -127,17 +127,17 @@
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7375832234660265597">
     <file name="mpsHttpSupportPlugin.xml">
-      <unit id="7375832234660265597" at="1,0,856,10" name="jetbrains.mps.ide.build.mpsHttpSupportPlugin" />
+      <unit id="7375832234660265597" at="1,0,862,10" name="jetbrains.mps.ide.build.mpsHttpSupportPlugin" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7401958389406848608">
     <file name="mpsJavaPlatform.xml">
-      <unit id="7401958389406848608" at="1,0,276,10" name="jetbrains.mps.ide.build.mpsJavaPlatform" />
+      <unit id="7401958389406848608" at="1,0,282,10" name="jetbrains.mps.ide.build.mpsJavaPlatform" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7735258172337199450">
     <file name="mpsTooltips.xml">
-      <unit id="7735258172337199450" at="1,0,537,10" name="jetbrains.mps.ide.build.mpsTooltips" />
+      <unit id="7735258172337199450" at="1,0,543,10" name="jetbrains.mps.ide.build.mpsTooltips" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7759561396119470053">
@@ -147,32 +147,32 @@
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/7926701909975931624">
     <file name="mpsBootstrapCore.xml">
-      <unit id="7926701909975931624" at="1,0,32581,10" name="jetbrains.mps.ide.build.mpsBootstrapCore" />
+      <unit id="7926701909975931624" at="1,0,32587,10" name="jetbrains.mps.ide.build.mpsBootstrapCore" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8006829063600512192">
     <file name="mpsJava.xml">
-      <unit id="8006829063600512192" at="1,0,298,10" name="jetbrains.mps.ide.build.mpsJava" />
+      <unit id="8006829063600512192" at="1,0,304,10" name="jetbrains.mps.ide.build.mpsJava" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8214399919540084172">
     <file name="mpsMigrationCore.xml">
-      <unit id="8214399919540084172" at="1,0,148,10" name="jetbrains.mps.ide.build.mpsMigrationCore" />
+      <unit id="8214399919540084172" at="1,0,152,10" name="jetbrains.mps.ide.build.mpsMigrationCore" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8214399919540087303">
     <file name="mpsMigration.xml">
-      <unit id="8214399919540087303" at="1,0,574,10" name="jetbrains.mps.ide.build.mpsMigration" />
+      <unit id="8214399919540087303" at="1,0,580,10" name="jetbrains.mps.ide.build.mpsMigration" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8227093612176368028">
     <file name="mpsBuildUI.xml">
-      <unit id="8227093612176368028" at="1,0,628,10" name="jetbrains.mps.ide.build.mpsBuildUI" />
+      <unit id="8227093612176368028" at="1,0,634,10" name="jetbrains.mps.ide.build.mpsBuildUI" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/8524659923334108558">
     <file name="mpsBuild.xml">
-      <unit id="8524659923334108558" at="1,0,2913,10" name="jetbrains.mps.ide.build.mpsBuild" />
+      <unit id="8524659923334108558" at="1,0,2919,10" name="jetbrains.mps.ide.build.mpsBuild" />
     </file>
   </root>
   <root nodeRef="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)/945136127677776238">
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml
index 40208fa28b4b..f5016a117f5e 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsEditorTestsPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsEditorTestsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsEditorTestsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsEditorTestsPlugin" />
   <property name="mps_home" location="${basedir}" />
@@ -53,6 +55,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml
index b03ce2b2c387..d5ae7de03afa 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaMigration.xml
@@ -1,6 +1,8 @@
 <project name="mpsIdeaMigration" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsIdeaMigration" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsIdeaMigration" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -177,6 +179,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -202,6 +206,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml
index d6567848ff9c..94c71d9a35cd 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsIdeaVcs.xml
@@ -1,6 +1,8 @@
 <project name="mpsIdeaVcs" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsIdeaVcs" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsIdeaVcs" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -389,6 +391,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -419,6 +423,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml
index 8ac8e1b58c55..a9a8236056f2 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJavaIdeaPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsJavaIdeaPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJavaIdeaPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJavaIdeaPlugin" />
   <property name="mps_home" location="${basedir}" />
@@ -88,6 +90,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml
index 4c7752a9c5e6..59d2a7aea8f9 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdea.xml
@@ -1,6 +1,8 @@
 <project name="mpsJpsIdea" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJpsIdea" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJpsIdea" />
   <property name="mps_home" location="${basedir}" />
@@ -75,6 +77,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml
index 945d45228ac6..3e218997da82 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsJpsIdeaJ8Compatibility.xml
@@ -1,6 +1,8 @@
 <project name="mpsJpsIdeaJ8Compatibility" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsJpsIdeaJ8Compatibility" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsJpsIdeaJ8Compatibility" />
   <property name="mps_home" location="${basedir}" />
@@ -79,6 +81,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml
index 7e30678639f6..1bd458093d03 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPlugin.xml
@@ -1,6 +1,8 @@
 <project name="mpsPlugin" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPlugin" />
   <property name="plugin.version" value="1.1.SNAPSHOT" />
@@ -95,6 +97,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml
index 34a0c5689ddd..6c2d510a3091 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/mpsPluginTests.xml
@@ -1,6 +1,8 @@
 <project name="mpsPluginTests" default="build" basedir="..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsPluginTests" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsPluginTests" />
   <property name="idea_home" location="" />
@@ -129,6 +131,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info
index b6c412acf65f..20d1e1edac60 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/idea/plugin/build/trace.info
@@ -7,7 +7,7 @@
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/2773971779181619526">
     <file name="mpsJavaIdeaPlugin.xml">
-      <unit id="2773971779181619526" at="1,0,179,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJavaIdeaPlugin" />
+      <unit id="2773971779181619526" at="1,0,183,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJavaIdeaPlugin" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/4609382717257597716">
@@ -17,22 +17,22 @@
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/4609382717257603555">
     <file name="mpsJpsIdea.xml">
-      <unit id="4609382717257603555" at="1,0,204,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJpsIdea" />
+      <unit id="4609382717257603555" at="1,0,208,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJpsIdea" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/4762870812623561207">
     <file name="mpsIdeaMigration.xml">
-      <unit id="4762870812623561207" at="1,0,328,10" name="jetbrains.mps.ide.idea.plugin.build.mpsIdeaMigration" />
+      <unit id="4762870812623561207" at="1,0,334,10" name="jetbrains.mps.ide.idea.plugin.build.mpsIdeaMigration" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/5148601452480491524">
     <file name="mpsPlugin.xml">
-      <unit id="5148601452480491524" at="1,0,124,10" name="jetbrains.mps.ide.idea.plugin.build.mpsPlugin" />
+      <unit id="5148601452480491524" at="1,0,128,10" name="jetbrains.mps.ide.idea.plugin.build.mpsPlugin" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/6803956629300513436">
     <file name="mpsJpsIdeaJ8Compatibility.xml">
-      <unit id="6803956629300513436" at="1,0,210,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJpsIdeaJ8Compatibility" />
+      <unit id="6803956629300513436" at="1,0,214,10" name="jetbrains.mps.ide.idea.plugin.build.mpsJpsIdeaJ8Compatibility" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/6936091511561272758">
@@ -42,17 +42,17 @@
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/6977615362525216882">
     <file name="mpsPluginTests.xml">
-      <unit id="6977615362525216882" at="1,0,283,10" name="jetbrains.mps.ide.idea.plugin.build.mpsPluginTests" />
+      <unit id="6977615362525216882" at="1,0,287,10" name="jetbrains.mps.ide.idea.plugin.build.mpsPluginTests" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/7848168823642910785">
     <file name="mpsEditorTestsPlugin.xml">
-      <unit id="7848168823642910785" at="1,0,75,10" name="jetbrains.mps.ide.idea.plugin.build.mpsEditorTestsPlugin" />
+      <unit id="7848168823642910785" at="1,0,79,10" name="jetbrains.mps.ide.idea.plugin.build.mpsEditorTestsPlugin" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/8128914530389845295">
     <file name="mpsIdeaVcs.xml">
-      <unit id="8128914530389845295" at="1,0,614,10" name="jetbrains.mps.ide.idea.plugin.build.mpsIdeaVcs" />
+      <unit id="8128914530389845295" at="1,0,620,10" name="jetbrains.mps.ide.idea.plugin.build.mpsIdeaVcs" />
     </file>
   </root>
   <root nodeRef="r:5c70a88b-9c77-4970-b930-a9ff601a03a0(jetbrains.mps.ide.idea.plugin.build)/8658995123701267517">
diff --git a/samples/customAspect/build.xml b/samples/customAspect/build.xml
index 973d6d524826..6d120d2b5719 100644
--- a/samples/customAspect/build.xml
+++ b/samples/customAspect/build.xml
@@ -1,6 +1,8 @@
 <project name="SampleCustomAspect" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/SampleCustomAspect" />
   <property name="build.layout" location="${build.dir}/artifacts/SampleCustomAspect" />
   <property name="idea_home" location="" />
@@ -492,6 +494,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -527,6 +531,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/SampleCustomAspect.xml b/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/SampleCustomAspect.xml
index 973d6d524826..6d120d2b5719 100644
--- a/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/SampleCustomAspect.xml
+++ b/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/SampleCustomAspect.xml
@@ -1,6 +1,8 @@
 <project name="SampleCustomAspect" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/SampleCustomAspect" />
   <property name="build.layout" location="${build.dir}/artifacts/SampleCustomAspect" />
   <property name="idea_home" location="" />
@@ -492,6 +494,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -527,6 +531,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/trace.info b/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/trace.info
index 14473283c2c8..00c9aab21927 100644
--- a/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/trace.info
+++ b/samples/customAspect/solutions/SampleCustomAspect.build/source_gen/SampleCustomAspect/build/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root nodeRef="r:a8841710-3165-4117-a7de-5485d8fc9d23(SampleCustomAspect.build)/5397364291408930696">
     <file name="SampleCustomAspect.xml">
-      <unit id="5397364291408930696" at="1,0,851,10" name="SampleCustomAspect.build.SampleCustomAspect" />
+      <unit id="5397364291408930696" at="1,0,857,10" name="SampleCustomAspect.build.SampleCustomAspect" />
     </file>
   </root>
 </debug-info>
diff --git a/samples/notesOrganizer/build.xml b/samples/notesOrganizer/build.xml
index 79e3b13f2bee..5e46167cbe7b 100644
--- a/samples/notesOrganizer/build.xml
+++ b/samples/notesOrganizer/build.xml
@@ -1,6 +1,8 @@
 <project name="notesOrganizer" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/notesOrganizer" />
   <property name="build.layout" location="${build.dir}/artifacts/notesOrganizer" />
   <property name="idea_home" location="${basedir}/../../../../../../Applications/IntelliJ IDEA.app/Contents" />
@@ -245,6 +247,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -269,6 +273,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/notesOrganizer.xml b/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/notesOrganizer.xml
index 79e3b13f2bee..5e46167cbe7b 100644
--- a/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/notesOrganizer.xml
+++ b/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/notesOrganizer.xml
@@ -1,6 +1,8 @@
 <project name="notesOrganizer" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/notesOrganizer" />
   <property name="build.layout" location="${build.dir}/artifacts/notesOrganizer" />
   <property name="idea_home" location="${basedir}/../../../../../../Applications/IntelliJ IDEA.app/Contents" />
@@ -245,6 +247,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -269,6 +273,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="idea_home" path="${idea_home}" />
diff --git a/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/trace.info b/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/trace.info
index 800666c527c8..33702752689f 100644
--- a/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/trace.info
+++ b/samples/notesOrganizer/solutions/jetbrains.mps.samples.notesOrganizer.build/source_gen/jetbrains/mps/samples/notesOrganizer/build/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root nodeRef="r:e3c79067-ec7e-47a1-835b-793d50730a6a(jetbrains.mps.samples.notesOrganizer.build)/3892287256990148316">
     <file name="notesOrganizer.xml">
-      <unit id="3892287256990148316" at="1,0,415,10" name="jetbrains.mps.samples.notesOrganizer.build.notesOrganizer" />
+      <unit id="3892287256990148316" at="1,0,421,10" name="jetbrains.mps.samples.notesOrganizer.build.notesOrganizer" />
     </file>
   </root>
 </debug-info>
diff --git a/samples/propertyPersistence/build.xml b/samples/propertyPersistence/build.xml
index 3c24f93ca4cf..b88574e2e63d 100644
--- a/samples/propertyPersistence/build.xml
+++ b/samples/propertyPersistence/build.xml
@@ -1,6 +1,8 @@
 <project name="propertyPersistence" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/propertyPersistence" />
   <property name="build.layout" location="${build.dir}/artifacts/propertyPersistence" />
   <property name="mps_dist" location="${basedir}/../../../../Downloads/MPS-213" />
@@ -354,6 +356,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -381,6 +385,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_dist" path="${mps_dist}" />
diff --git a/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/propertyPersistence.xml b/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/propertyPersistence.xml
index 3c24f93ca4cf..b88574e2e63d 100644
--- a/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/propertyPersistence.xml
+++ b/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/propertyPersistence.xml
@@ -1,6 +1,8 @@
 <project name="propertyPersistence" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/propertyPersistence" />
   <property name="build.layout" location="${build.dir}/artifacts/propertyPersistence" />
   <property name="mps_dist" location="${basedir}/../../../../Downloads/MPS-213" />
@@ -354,6 +356,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -381,6 +385,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_dist" path="${mps_dist}" />
diff --git a/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/trace.info b/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/trace.info
index 4b2f47bf46c6..15da4cb483a9 100644
--- a/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/trace.info
+++ b/samples/propertyPersistence/solutions/jetbrains.mps.samples.propertyPersistence.build/source_gen/build/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root nodeRef="r:88143911-1b91-4fcf-ae80-2502562c8aa9(build)/5586542675088810179">
     <file name="propertyPersistence.xml">
-      <unit id="5586542675088810179" at="1,0,594,10" name="build.propertyPersistence" />
+      <unit id="5586542675088810179" at="1,0,600,10" name="build.propertyPersistence" />
     </file>
   </root>
 </debug-info>
diff --git a/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/buildOfSampleJavaExtensions.xml b/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/buildOfSampleJavaExtensions.xml
index 52f99d55c8a0..e8dba8567045 100644
--- a/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/buildOfSampleJavaExtensions.xml
+++ b/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/buildOfSampleJavaExtensions.xml
@@ -1,6 +1,8 @@
 <project name="buildOfSampleJavaExtensions" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/buildOfSampleJavaExtensions" />
   <property name="build.layout" location="${build.dir}/artifacts/buildOfSampleJavaExtensions" />
   <property name="mps_home" location="${basedir}/../../../../../Applications/MPS 2023.3.app/Contents" />
@@ -789,6 +791,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -820,6 +824,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/trace.info b/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/trace.info
index 726f973940db..9d4d2c3f8bb9 100644
--- a/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/trace.info
+++ b/samples/sampleJavaExtensions/solutions/Build/source_gen/org/jetbrains/mps/samples/Build/build/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root nodeRef="r:91fb18c7-a74a-4784-95fb-46b200b2b62a(org.jetbrains.mps.samples.Build.build)/8968584541678373554">
     <file name="buildOfSampleJavaExtensions.xml">
-      <unit id="8968584541678373554" at="1,0,1404,10" name="org.jetbrains.mps.samples.Build.build.buildOfSampleJavaExtensions" />
+      <unit id="8968584541678373554" at="1,0,1410,10" name="org.jetbrains.mps.samples.Build.build.buildOfSampleJavaExtensions" />
     </file>
   </root>
 </debug-info>
diff --git a/samples/xmlPersistence/build.xml b/samples/xmlPersistence/build.xml
index 8ab29f49d221..469256ba7c1e 100644
--- a/samples/xmlPersistence/build.xml
+++ b/samples/xmlPersistence/build.xml
@@ -1,6 +1,8 @@
 <project name="xmlPersistencePlugin" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/xmlPersistencePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/xmlPersistencePlugin" />
   <property name="mps_dist" location="${basedir}/../../work/MPS 2021.2" />
@@ -148,6 +150,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -176,6 +180,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_dist" path="${mps_dist}" />
diff --git a/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/trace.info b/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/trace.info
index 41828f57629d..c6d99a335849 100644
--- a/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/trace.info
+++ b/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/trace.info
@@ -2,7 +2,7 @@
 <debug-info version="2">
   <root nodeRef="r:e21135fb-2b5c-4d73-ac93-7950a105e058(jetbrains.mps.samples.xmlPersistence.build)/9212378209272343143">
     <file name="xmlPersistencePlugin.xml">
-      <unit id="9212378209272343143" at="1,0,239,10" name="jetbrains.mps.samples.xmlPersistence.build.xmlPersistencePlugin" />
+      <unit id="9212378209272343143" at="1,0,245,10" name="jetbrains.mps.samples.xmlPersistence.build.xmlPersistencePlugin" />
     </file>
   </root>
 </debug-info>
diff --git a/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/xmlPersistencePlugin.xml b/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/xmlPersistencePlugin.xml
index 8ab29f49d221..469256ba7c1e 100644
--- a/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/xmlPersistencePlugin.xml
+++ b/samples/xmlPersistence/languages/jetbrains.mps.samples.xmlPersistence.build/source_gen/jetbrains/mps/samples/xmlPersistence/build/xmlPersistencePlugin.xml
@@ -1,6 +1,8 @@
 <project name="xmlPersistencePlugin" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/xmlPersistencePlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/xmlPersistencePlugin" />
   <property name="mps_dist" location="${basedir}/../../work/MPS 2021.2" />
@@ -148,6 +150,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -176,6 +180,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_dist" path="${mps_dist}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml
index c53460c86c2e..1787a4d858a8 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test1.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test1" />
   <property name="build.layout" location="${build.dir}/artifacts/test1" />
   <property name="mps_home" location="" />
@@ -86,6 +88,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -113,6 +117,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml
index 546b04134f71..8aeb3896d9ab 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test2.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test2" />
   <property name="build.layout" location="${build.dir}/artifacts/test2" />
   <property name="mps_home" location="" />
@@ -124,6 +126,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -152,6 +156,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml
index fe795ea6a372..5d8636dd6aac 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test3.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test3" />
   <property name="build.layout" location="${build.dir}/artifacts/test3" />
   <property name="mps_home" location="" />
@@ -91,6 +93,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -118,6 +122,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml
index 38584d41928d..ca46efd0bc3d 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test4.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test4" />
   <property name="build.layout" location="${build.dir}/artifacts/test4" />
   <property name="mps_home" location="" />
@@ -140,6 +142,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -168,6 +172,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml
index 625cb8bd10f6..705ac6479a84 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/test5.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test5" />
   <property name="build.layout" location="${build.dir}/artifacts/test5" />
   <property name="mps_home" location="" />
@@ -139,6 +141,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -167,6 +171,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml
index ea018bc9fd55..4e87f4bb0f06 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/testDummyPlugin.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/testDummyPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/testDummyPlugin" />
   <property name="mps_home" location="" />
@@ -95,6 +97,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -122,6 +126,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info
index b8c8e6805417..dc1ce4033efb 100644
--- a/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info
+++ b/testbench/modules/build.mps.runner.test/jetbrains.mps.build.mps.runner.test.buildscript/source_gen/jetbrains/mps/build/mps/runner/test/buildscript/trace.info
@@ -2,32 +2,32 @@
 <debug-info version="2">
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/1101389554473443113">
     <file name="testDummyPlugin.xml">
-      <unit id="1101389554473443113" at="1,0,209,10" name="jetbrains.mps.build.mps.runner.test.buildscript.testDummyPlugin" />
+      <unit id="1101389554473443113" at="1,0,215,10" name="jetbrains.mps.build.mps.runner.test.buildscript.testDummyPlugin" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/138593292063253314">
     <file name="test3.xml">
-      <unit id="138593292063253314" at="1,0,206,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test3" />
+      <unit id="138593292063253314" at="1,0,212,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test3" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/2304492758936981542">
     <file name="test4.xml">
-      <unit id="2304492758936981542" at="1,0,280,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test4" />
+      <unit id="2304492758936981542" at="1,0,286,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test4" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/3307120220351780865">
     <file name="test5.xml">
-      <unit id="3307120220351780865" at="1,0,276,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test5" />
+      <unit id="3307120220351780865" at="1,0,282,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test5" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/5712055271175299542">
     <file name="test1.xml">
-      <unit id="5712055271175299542" at="1,0,167,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test1" />
+      <unit id="5712055271175299542" at="1,0,173,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test1" />
     </file>
   </root>
   <root nodeRef="r:1df60b02-4b01-4931-9ed0-efa7ab133a2f(jetbrains.mps.build.mps.runner.test.buildscript)/5712055271175358329">
     <file name="test2.xml">
-      <unit id="5712055271175358329" at="1,0,226,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test2" />
+      <unit id="5712055271175358329" at="1,0,232,10" name="jetbrains.mps.build.mps.runner.test.buildscript.test2" />
     </file>
   </root>
 </debug-info>
diff --git a/testbench/modules/build.mps.runner.test/test1.xml b/testbench/modules/build.mps.runner.test/test1.xml
index c53460c86c2e..1787a4d858a8 100644
--- a/testbench/modules/build.mps.runner.test/test1.xml
+++ b/testbench/modules/build.mps.runner.test/test1.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test1" />
   <property name="build.layout" location="${build.dir}/artifacts/test1" />
   <property name="mps_home" location="" />
@@ -86,6 +88,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -113,6 +117,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/test2.xml b/testbench/modules/build.mps.runner.test/test2.xml
index 546b04134f71..8aeb3896d9ab 100644
--- a/testbench/modules/build.mps.runner.test/test2.xml
+++ b/testbench/modules/build.mps.runner.test/test2.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test2" />
   <property name="build.layout" location="${build.dir}/artifacts/test2" />
   <property name="mps_home" location="" />
@@ -124,6 +126,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -152,6 +156,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/test3.xml b/testbench/modules/build.mps.runner.test/test3.xml
index fe795ea6a372..5d8636dd6aac 100644
--- a/testbench/modules/build.mps.runner.test/test3.xml
+++ b/testbench/modules/build.mps.runner.test/test3.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test3" />
   <property name="build.layout" location="${build.dir}/artifacts/test3" />
   <property name="mps_home" location="" />
@@ -91,6 +93,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -118,6 +122,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/test4.xml b/testbench/modules/build.mps.runner.test/test4.xml
index 38584d41928d..ca46efd0bc3d 100644
--- a/testbench/modules/build.mps.runner.test/test4.xml
+++ b/testbench/modules/build.mps.runner.test/test4.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test4" />
   <property name="build.layout" location="${build.dir}/artifacts/test4" />
   <property name="mps_home" location="" />
@@ -140,6 +142,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -168,6 +172,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/test5.xml b/testbench/modules/build.mps.runner.test/test5.xml
index 625cb8bd10f6..705ac6479a84 100644
--- a/testbench/modules/build.mps.runner.test/test5.xml
+++ b/testbench/modules/build.mps.runner.test/test5.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/test5" />
   <property name="build.layout" location="${build.dir}/artifacts/test5" />
   <property name="mps_home" location="" />
@@ -139,6 +141,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -167,6 +171,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/build.mps.runner.test/testDummyPlugin.xml b/testbench/modules/build.mps.runner.test/testDummyPlugin.xml
index ea018bc9fd55..4e87f4bb0f06 100644
--- a/testbench/modules/build.mps.runner.test/testDummyPlugin.xml
+++ b/testbench/modules/build.mps.runner.test/testDummyPlugin.xml
@@ -3,6 +3,8 @@
   <property name="build.dir" location="build" />
   <property name="build.mps.config.path" location="${build.dir}/config" />
   <property name="build.mps.system.path" location="${build.dir}/system" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/testDummyPlugin" />
   <property name="build.layout" location="${build.dir}/artifacts/testDummyPlugin" />
   <property name="mps_home" location="" />
@@ -95,6 +97,8 @@
   <target name="build" depends="assemble, run-mps-code" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.mps.config.path}" />
     <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
@@ -122,6 +126,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/xmodel.build/p1.xml b/testbench/modules/xmodel.build/p1.xml
index a6ecae71486b..57acfcf863ed 100644
--- a/testbench/modules/xmodel.build/p1.xml
+++ b/testbench/modules/xmodel.build/p1.xml
@@ -1,6 +1,8 @@
 <project name="p1" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/p1" />
   <property name="build.layout" location="${build.dir}/artifacts/p1" />
   <property name="mps_home" location="" />
@@ -216,6 +218,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -245,6 +249,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/xmodel.build/p2.xml b/testbench/modules/xmodel.build/p2.xml
index ac197174a812..6415e2f495dd 100644
--- a/testbench/modules/xmodel.build/p2.xml
+++ b/testbench/modules/xmodel.build/p2.xml
@@ -1,6 +1,8 @@
 <project name="p2" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/p2" />
   <property name="build.layout" location="${build.dir}/artifacts/p2" />
   <property name="mps_home" location="" />
@@ -89,6 +91,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -117,6 +121,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p1.xml b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p1.xml
index a6ecae71486b..57acfcf863ed 100644
--- a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p1.xml
+++ b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p1.xml
@@ -1,6 +1,8 @@
 <project name="p1" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/p1" />
   <property name="build.layout" location="${build.dir}/artifacts/p1" />
   <property name="mps_home" location="" />
@@ -216,6 +218,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -245,6 +249,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p2.xml b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p2.xml
index ac197174a812..6415e2f495dd 100644
--- a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p2.xml
+++ b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/p2.xml
@@ -1,6 +1,8 @@
 <project name="p2" default="build" basedir="../../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
+  <property name="build.mps.config.path" location="${build.dir}/config" />
+  <property name="build.mps.system.path" location="${build.dir}/system" />
   <property name="build.tmp" location="${build.dir}/tmp/p2" />
   <property name="build.layout" location="${build.dir}/artifacts/p2" />
   <property name="mps_home" location="" />
@@ -89,6 +91,8 @@
   <target name="build" depends="assemble" />
   
   <target name="clean">
+    <delete dir="${build.mps.config.path}" />
+    <delete dir="${build.mps.system.path}" />
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
@@ -117,6 +121,8 @@
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx512m" />
+        <arg value="-Didea.config.path=${build.mps.config.path}" />
+        <arg value="-Didea.system.path=${build.mps.system.path}" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
diff --git a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/trace.info b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/trace.info
index c907fb960d6a..10c8666c5d52 100644
--- a/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/trace.info
+++ b/testbench/modules/xmodel.build/source_gen/jetbrains/mps/generator/xmodel/build/test/build/trace.info
@@ -2,12 +2,12 @@
 <debug-info version="2">
   <root nodeRef="r:c038eee7-4c1b-499b-b130-c7394a2f3517(jetbrains.mps.generator.xmodel.build.test.build)/4147559706650342950">
     <file name="p1.xml">
-      <unit id="4147559706650342950" at="1,0,394,10" name="jetbrains.mps.generator.xmodel.build.test.build.p1" />
+      <unit id="4147559706650342950" at="1,0,400,10" name="jetbrains.mps.generator.xmodel.build.test.build.p1" />
     </file>
   </root>
   <root nodeRef="r:c038eee7-4c1b-499b-b130-c7394a2f3517(jetbrains.mps.generator.xmodel.build.test.build)/4147559706650342953">
     <file name="p2.xml">
-      <unit id="4147559706650342953" at="1,0,156,10" name="jetbrains.mps.generator.xmodel.build.test.build.p2" />
+      <unit id="4147559706650342953" at="1,0,162,10" name="jetbrains.mps.generator.xmodel.build.test.build.p2" />
     </file>
   </root>
 </debug-info>