diff --git a/build.gradle b/build.gradle
index 9705691e..821c70e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,7 @@ configurations {
 dependencies {
     // Use the following dependency for published releases:
     //   mps 'com.jetbrains:mps:2024.3'
-    mps 'com.jetbrains.mps:mps-prerelease:243.21565.10057'
+    mps 'com.jetbrains.mps:mps-prerelease:243.24978.10419'
     antLib "org.apache.ant:ant-junit:1.10.15"
     antLib "org.jacoco:org.jacoco.ant:0.8.12"
 }
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index e35a40b0..f2f76bf5 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -65,8 +65,10 @@
     <echo message="generating" />
     <generate fork="true" logLevel="${mps.ant.log}">      
       <settings refid="m2m-defaults" />
+      <plugin path="${artifacts.mps}/lib/mps-workbench.jar" id="com.intellij.modules.mps" />
       <plugin path="${artifacts.mps}/plugins/mps-build" id="jetbrains.mps.build" />
       <plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
+      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
       <chunk>
         <module file="${basedir}/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/org.mpsqa.base.build.msd" />
         <module file="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd" />
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps
index e6edfe65..eff771ef 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps
@@ -224,7 +224,6 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
@@ -576,7 +575,7 @@
     <node concept="3clFb_" id="4c7y4qc4X0x" role="jymVt">
       <property role="TrG5h" value="checkNodeInEditor" />
       <node concept="3cqZAl" id="4c7y4qc4X0y" role="3clF45" />
-      <node concept="3Tmbuc" id="4c7y4qc4X0z" role="1B3o_S" />
+      <node concept="3Tm1VV" id="2z3U39tXxq2" role="1B3o_S" />
       <node concept="37vLTG" id="4c7y4qc4X0_" role="3clF46">
         <property role="TrG5h" value="node" />
         <node concept="3Tqbb2" id="4c7y4qc4X0A" role="1tU5fm" />
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
index 0dca0c6b..9783ab05 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
@@ -27,6 +27,7 @@
     <import index="kdzh" ref="r:0353b795-df17-4050-9687-ee47eeb7094f(jetbrains.mps.build.mps.structure)" />
     <import index="arit" ref="r:0d66e868-9778-4307-b6f9-4795c00f662f(jetbrains.mps.build.workflow.preset.general)" />
     <import index="ghic" ref="r:027cef15-cbe6-4eb7-95e6-aa7a538ab07c(org.mpsqa.testcov.buildIntegration.jacoco.generator.util)" />
+    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="jvez" ref="r:76c0c154-d1d8-4324-a714-0c8d4f287536(org.mpsqa.testcov.buildIntegration.jacoco.behavior)" implicit="true" />
   </imports>
@@ -932,21 +933,17 @@
                         <ref role="3uigEE" to="o3n2:5FtnUVJR86u" resolve="MacroHelper" />
                       </node>
                       <node concept="2OqwBi" id="4JpXQ$UYAKj" role="33vP2m">
-                        <node concept="2ShNRf" id="4JpXQ$UYAKk" role="2Oq$k0">
-                          <node concept="1pGfFk" id="4JpXQ$UYAKl" role="2ShVmc">
-                            <ref role="37wK5l" to="o3n2:5DY7s5F2Pa1" resolve="MacroHelper.MacroContext" />
-                            <node concept="37vLTw" id="4JpXQ$UYAKm" role="37wK5m">
-                              <ref role="3cqZAo" node="4JpXQ$UYAK9" resolve="project" />
-                            </node>
-                            <node concept="1iwH7S" id="4JpXQ$UYAKn" role="37wK5m" />
-                          </node>
-                        </node>
                         <node concept="liA8E" id="4JpXQ$UYAKo" role="2OqNvi">
-                          <ref role="37wK5l" to="o3n2:5DY7s5F2PaT" resolve="getMacros" />
+                          <ref role="37wK5l" to="o3n2:5DY7s5F3vd2" resolve="getMacros" />
                           <node concept="37vLTw" id="4JpXQ$UYAKp" role="37wK5m">
                             <ref role="3cqZAo" node="4JpXQ$UYAK9" resolve="project" />
                           </node>
                         </node>
+                        <node concept="2YIFZM" id="5EsFsG7_yxm" role="2Oq$k0">
+                          <ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
+                          <ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
+                          <node concept="1iwH7S" id="5EsFsG7_yxn" role="37wK5m" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -1749,21 +1746,17 @@
                                 <ref role="3uigEE" to="o3n2:5FtnUVJR86u" resolve="MacroHelper" />
                               </node>
                               <node concept="2OqwBi" id="HwplGM7Emf" role="33vP2m">
-                                <node concept="2ShNRf" id="HwplGM7Emg" role="2Oq$k0">
-                                  <node concept="1pGfFk" id="HwplGM7Emh" role="2ShVmc">
-                                    <ref role="37wK5l" to="o3n2:5DY7s5F2Pa1" resolve="MacroHelper.MacroContext" />
-                                    <node concept="37vLTw" id="HwplGM7Emi" role="37wK5m">
-                                      <ref role="3cqZAo" node="HwplGM7Em5" resolve="project" />
-                                    </node>
-                                    <node concept="1iwH7S" id="HwplGM7Emj" role="37wK5m" />
-                                  </node>
-                                </node>
                                 <node concept="liA8E" id="HwplGM7Emk" role="2OqNvi">
-                                  <ref role="37wK5l" to="o3n2:5DY7s5F2PaT" resolve="getMacros" />
-                                  <node concept="37vLTw" id="HwplGM7Eml" role="37wK5m">
+                                  <ref role="37wK5l" to="o3n2:5DY7s5F3vd2" resolve="getMacros" />
+                                  <node concept="37vLTw" id="5EsFsG7_xKh" role="37wK5m">
                                     <ref role="3cqZAo" node="HwplGM7Em5" resolve="project" />
                                   </node>
                                 </node>
+                                <node concept="2YIFZM" id="5EsFsG7_xYd" role="2Oq$k0">
+                                  <ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
+                                  <ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
+                                  <node concept="1iwH7S" id="5EsFsG7_xYe" role="37wK5m" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -2269,21 +2262,17 @@
                                   <ref role="3uigEE" to="o3n2:5FtnUVJR86u" resolve="MacroHelper" />
                                 </node>
                                 <node concept="2OqwBi" id="4JpXQ$UYZHj" role="33vP2m">
-                                  <node concept="2ShNRf" id="4JpXQ$UYZHk" role="2Oq$k0">
-                                    <node concept="1pGfFk" id="4JpXQ$UYZHl" role="2ShVmc">
-                                      <ref role="37wK5l" to="o3n2:5DY7s5F2Pa1" resolve="MacroHelper.MacroContext" />
-                                      <node concept="37vLTw" id="4JpXQ$UYZHm" role="37wK5m">
-                                        <ref role="3cqZAo" node="4JpXQ$UYZH9" resolve="project" />
-                                      </node>
-                                      <node concept="1iwH7S" id="4JpXQ$UYZHn" role="37wK5m" />
-                                    </node>
-                                  </node>
                                   <node concept="liA8E" id="4JpXQ$UYZHo" role="2OqNvi">
-                                    <ref role="37wK5l" to="o3n2:5DY7s5F2PaT" resolve="getMacros" />
+                                    <ref role="37wK5l" to="o3n2:5DY7s5F3vd2" resolve="getMacros" />
                                     <node concept="37vLTw" id="4JpXQ$UYZHp" role="37wK5m">
                                       <ref role="3cqZAo" node="4JpXQ$UYZH9" resolve="project" />
                                     </node>
                                   </node>
+                                  <node concept="2YIFZM" id="5EsFsG7_$2P" role="2Oq$k0">
+                                    <ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
+                                    <ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
+                                    <node concept="1iwH7S" id="5EsFsG7_$2Q" role="37wK5m" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -3452,21 +3441,17 @@
                                 <ref role="3uigEE" to="o3n2:5FtnUVJR86u" resolve="MacroHelper" />
                               </node>
                               <node concept="2OqwBi" id="51DD0tdMhSl" role="33vP2m">
-                                <node concept="2ShNRf" id="51DD0tdMhSm" role="2Oq$k0">
-                                  <node concept="1pGfFk" id="51DD0tdMhSn" role="2ShVmc">
-                                    <ref role="37wK5l" to="o3n2:5DY7s5F2Pa1" resolve="MacroHelper.MacroContext" />
-                                    <node concept="37vLTw" id="51DD0tdMhSo" role="37wK5m">
-                                      <ref role="3cqZAo" node="51DD0tdMhSb" resolve="project" />
-                                    </node>
-                                    <node concept="1iwH7S" id="51DD0tdMhSp" role="37wK5m" />
-                                  </node>
-                                </node>
                                 <node concept="liA8E" id="51DD0tdMhSq" role="2OqNvi">
-                                  <ref role="37wK5l" to="o3n2:5DY7s5F2PaT" resolve="getMacros" />
-                                  <node concept="37vLTw" id="51DD0tdMhSr" role="37wK5m">
+                                  <ref role="37wK5l" to="o3n2:5DY7s5F3vd2" resolve="getMacros" />
+                                  <node concept="37vLTw" id="5EsFsG7_xEB" role="37wK5m">
                                     <ref role="3cqZAo" node="51DD0tdMhSb" resolve="project" />
                                   </node>
                                 </node>
+                                <node concept="2YIFZM" id="5EsFsG7_ymF" role="2Oq$k0">
+                                  <ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
+                                  <ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
+                                  <node concept="1iwH7S" id="5EsFsG7_ymG" role="37wK5m" />
+                                </node>
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/org.mpsqa.testing/sandbox/build.xml b/code/languages/org.mpsqa.testing/sandbox/build.xml
index d93e8c66..22053cc3 100644
--- a/code/languages/org.mpsqa.testing/sandbox/build.xml
+++ b/code/languages/org.mpsqa.testing/sandbox/build.xml
@@ -166,6 +166,7 @@
     <echo message="generating" />
     <generate fork="true" logLevel="${mps.ant.log}">      
       <settings refid="m2m-defaults" />
+      <plugin path="${artifacts.mps}/lib/mps-workbench.jar" id="com.intellij.modules.mps" />
       <plugin path="${artifacts.mps}/plugins/mps-build" id="jetbrains.mps.build" />
       <plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
       <plugin path="${artifacts.mps}/plugins/mps-junit5" id="jetbrains.mps.junit5" />
@@ -174,6 +175,7 @@
       <plugin path="${artifacts.org.mpsqa.base}/org.mpsqa.base.build" id="org.mpsqa.base.build" />
       <plugin path="${artifacts.org.mpsqa.testing}/org.mpsqa.testing" id="org.mpsqa.testing" />
       <plugin path="${artifacts.org.mpsqa.testing}/org.mpsqa.testing.build" id="org.mpsqa.testing.build" />
+      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
       <chunk>
         <module file="${basedir}/jacoco.sandbox/jacoco.sandbox.msd" />
         <module file="${basedir}/jacoco.sandbox.build/jacoco.sandbox.build.msd" />