diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d7051324..3cffd8b9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - de.slisson.mps.richtext: Various small issues were fixed (e.g. NullPointerExceptions, usability problems).
 - de.slisson.mps.editor.multiline: Selections are now correctly painted.
+- com.mbeddr.mpsutil.editor.querylist: return null in the query shows the empty cell again (regression).
 
 ### Changed
 
@@ -54,28 +55,12 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - com.mbeddr.mpsutil.modellisteners: The newly supported interface listeners are now backward compatible and doesn't require regenerating the listener aspects anymore.
 
-### Changed
-
-- de.itemis.editor.diagram: The ELK dependencies were updated to the latest version.
-- de.itemis.mps.debug: The editor debug expressions were moved to a new plugin to avoid introducing a dependency to the MPS console in the celllayout language.
-
 ## December 2023
 
-### Fixed
-
-- de.itemis.editor.diagram: Further improvements to make the auto-layouter more stable.
-- de.itemis.editor.diagram: Tooltips for edge and vertex buttons work again.
-- de.itemis.editor.diagram: The size of diagram cells is now recalculated before layouting the ports to fix some layout issues.
-- The size of diagram cells is now recalculated before layouting the ports to fix some layout issues.
-
 ### Added
 
 - A new language `de.itemis.mps.statistics` was added that adds a new menu `MPS Statistics` to the `Tools`  menu. The containing action writes a file `dependencies.txt` to the root folder. It contains all the used dependencies of the current project. 
 - de.slisson.mps.tables: tables now support a new property `column UI actions (experimental)`: This property adds actions to the MPS toolbar to add a new column above/below the current column or to delete the current column. These actions only work for simple tables that are based on rows (default: *false*).
-- de.slisson.mps.richtext: The shortcuts are now documented.
-- A new action `Copy Cell Reference` is available in the editor menu in `Language Debug` that creates a reference to the current select editor cell. It can be pasted into the MPS console to debug editor cells. It can be activated through ctrl/cmd+alt+c.
-- A new action `Copy Editor Component Reference` is available in the editor menu in `Language Debug` that creates a reference to the current editor component. It can be pasted into the MPS console to debug editor cells. To refer to the current opened editor component, use the expression `#currentEditorComponent` in the MPS console.
-- de.itemis.mps.editor.pagination: The ability to search was added.
 
 ### Fixed
 
@@ -83,16 +68,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ### Changed
 
-- de.slisson.mps.richtext: The code completion entries of word cells are now clearer and unnecessary entries were removed.
 - mpsutil.intentions: Intentions available in read-only cells are not available anymore when the annotation showIntentionInReadyOnlyCell is not added.
-- de.itemis.mps.editor.pagination: The UI was cleaned up.
 
 ## November 2023
 
-### Fixed
-
-- app.jar from the platform lib folder is not exported to platform_lib_app/app.jar anymore.
-
 ### Changed
 
 - mpsutil.modellisteners: listeners on interface concepts are now supported.
@@ -104,7 +83,6 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 - mpsutil.intentions: a new style attribute `intentions-in-read-only-cell` is now available to allow intentions in read-only cells. Single intentions can also be enabled or disabled in those cells through the intention "Toggle Show Intention In Read-Only Cell Annotation".
 - com.mbeddr.mpsutil.editor.querylist: Default editor cells now support style attributes.
 - de.slisson.mps.tables: tables now support a new property `row UI actions (experimental)`: This property adds actions to the MPS toolbar to add a new row above/below the current row or to delete the current row. These actions only work for simple tables that are based on rows (default: *false*).
-- de.itemis.mps.editor.pagination: The page number can now be entered directly.
 
 ## October 2023
 
diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml
index 5e4d28224..96a10897c 100644
--- a/code/.mps/modules.xml
+++ b/code/.mps/modules.xml
@@ -21,7 +21,6 @@
       <modulePath path="$PROJECT_DIR$/celllayout/languages/test.de.itemis.mps.editor.celllayout.lang/test.de.itemis.mps.editor.celllayout.lang.mpl" folder="celllayout" />
       <modulePath path="$PROJECT_DIR$/celllayout/solutions/de.itemis.mps.editor.celllayout.sandbox/de.itemis.mps.editor.celllayout.sandbox.msd" folder="celllayout" />
       <modulePath path="$PROJECT_DIR$/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/de.itemis.mps.editor.celllayout.runtime.msd" folder="celllayout" />
-      <modulePath path="$PROJECT_DIR$/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd" folder="celllayout" />
       <modulePath path="$PROJECT_DIR$/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/test.de.itemis.mps.editor.celllayout.msd" folder="celllayout" />
       <modulePath path="$PROJECT_DIR$/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl" folder="conditional-editor" />
       <modulePath path="$PROJECT_DIR$/conditional-editor/languages/de.slisson.mps.conditionalEditor.hints/de.slisson.mps.conditionalEditor.hints.mpl" folder="conditional-editor" />
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps
index 2e7db55f2..65cfd9ad1 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps
@@ -415,14 +415,14 @@
       <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
-      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_IsApplicable" flags="ig" index="1eYwpX" />
-      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_Execute" flags="ig" index="1eYxTg" />
-      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2" flags="ng" index="1eYWM2">
+      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_IsApplicable" flags="ig" index="1eYwpX" />
+      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Execute" flags="ig" index="1eYxTg" />
+      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell" flags="ng" index="1eYWM2">
         <child id="4874944647490523335" name="matchingText" index="1eYxyj" />
         <child id="4874944647490523330" name="isApplicable" index="1eYxym" />
         <child id="4874944647490524677" name="execute" index="1eYxTh" />
       </concept>
-      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_MatchingText" flags="ig" index="1eYWSL" />
+      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_MatchingText" flags="ig" index="1eYWSL" />
     </language>
     <language id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell">
       <concept id="1161622981231" name="de.slisson.mps.richtext.customcell.structure.ConceptFunctionParameter_cell" flags="nn" index="1Q80Hy" />
diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps
index cf5cbc402..0369c2f72 100644
--- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps
+++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps
@@ -2,7 +2,7 @@
 <model ref="r:a0ad4fb2-84d1-4370-9588-bb53940875f7(test.com.mbeddr.mpsutil.blutil.doc@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
diff --git a/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd b/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd
index 097ecd1c1..215edae8c 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd
+++ b/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd
@@ -20,6 +20,7 @@
     <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 0bd2527be..c77329bdf 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -14523,6 +14523,19 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="3Z_1kA5Z4k6" role="3bR31x">
+          <node concept="3LXTmp" id="3Z_1kA5Z4k7" role="3rtmxm">
+            <node concept="398BVA" id="3Z_1kA5Z4k8" role="3LXTmr">
+              <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
+              <node concept="2Ry0Ak" id="3Z_1kA5Z4k9" role="iGT6I">
+                <property role="2Ry0Am" value="statistics" />
+              </node>
+            </node>
+            <node concept="3qWCbU" id="3Z_1kA5Z4kb" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="4bHoaiHvmsq" role="3989C9">
diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd b/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd
deleted file mode 100644
index c1c4cbc24..000000000
--- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="de.slisson.mps.editor.celllayout" uuid="82e207b8-5675-4dc6-8a49-c20a38dccf66" moduleVersion="0" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <facets>
-    <facet type="java">
-      <classes generated="true" path="${module}/classes_gen" />
-    </facet>
-  </facets>
-  <sourcePath />
-  <languageVersions />
-  <dependencyVersions>
-    <module reference="82e207b8-5675-4dc6-8a49-c20a38dccf66(de.slisson.mps.editor.celllayout)" version="0" />
-  </dependencyVersions>
-</solution>
-
diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/editor.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/editor.mps
index 3ca5d420b..9adbd8b88 100644
--- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/editor.mps
+++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/editor.mps
@@ -617,7 +617,7 @@
     <node concept="19Szcq" id="6LUJA7fQCK" role="2Iya4_">
       <property role="TrG5h" value="cond" />
       <node concept="3uibUv" id="6LUJA7fY7s" role="1tU5fm">
-        <ref role="3uigEE" node="6LUJA7fXc$" resolve="SerializableRunnable" />
+        <ref role="3uigEE" node="6LUJA7fXc$" resolve="SerializablePredicate" />
       </node>
     </node>
     <node concept="19Szcq" id="1gBmad3PiPd" role="2Iya4_">
diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/structure.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/structure.mps
index 69b6aaadd..695bf4b2c 100644
--- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/structure.mps
+++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/structure.mps
@@ -44,7 +44,7 @@
     <property role="EcuMT" value="6733065834253110129" />
     <property role="TrG5h" value="A" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="5PKDVfNYsHO" role="PzmwI">
       <ref role="PrY4T" node="5PKDVfNYsHN" resolve="Interface" />
     </node>
@@ -53,7 +53,7 @@
     <property role="EcuMT" value="6733065834253110130" />
     <property role="TrG5h" value="B" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="5PKDVfNYsHQ" role="PzmwI">
       <ref role="PrY4T" node="5PKDVfNYsHN" resolve="Interface" />
     </node>
diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps
index 00d56a480..214eb1e71 100644
--- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps
+++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps
@@ -449,7 +449,7 @@
     <node concept="3aamgX" id="5PKDVfOkTuY" role="3acgRq">
       <ref role="30HIoZ" to="91fu:5PKDVfOkPcZ" resolve="EditorComponentParameterReference" />
       <node concept="j$656" id="5PKDVfOkTvc" role="1lVwrX">
-        <ref role="v9R2y" node="5PKDVfOkTva" resolve="reduce_EditorComponentDeclarationReference" />
+        <ref role="v9R2y" node="5PKDVfOkTva" resolve="reduce_EditorComponentParameterReference" />
       </node>
     </node>
     <node concept="3aamgX" id="5PKDVfOlWDd" role="3acgRq">
@@ -1759,7 +1759,7 @@
                       </node>
                       <node concept="1P9Npp" id="5PKDVfOaBrN" role="2OqNvi">
                         <node concept="37vLTw" id="5PKDVfOaClO" role="1P9ThW">
-                          <ref role="3cqZAo" node="5PKDVfOaClK" resolve="replaceWithNewConcept" />
+                          <ref role="3cqZAo" node="5PKDVfOaClK" resolve="newNode" />
                         </node>
                       </node>
                     </node>
diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps
index f7da0edc7..7813c18ef 100644
--- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps
+++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps
@@ -786,7 +786,7 @@
   <node concept="24kQdi" id="5PKDVfOlsvS">
     <ref role="1XX52x" to="91fu:5PKDVfOlsvP" resolve="StubCellModel_ComponentWithParameters" />
     <node concept="PMmxH" id="5PKDVfOlsvT" role="2wV5jI">
-      <ref role="PMmxG" to="tpco:37EzmTDC95l" />
+      <ref role="PMmxG" to="tpco:37EzmTDC95l" resolve="ImplementationRemovedInStubMessage" />
     </node>
   </node>
   <node concept="22mcaB" id="5PKDVfOlsvU">
diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/structure.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/structure.mps
index 3dc952926..8cae435e9 100644
--- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/structure.mps
+++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/structure.mps
@@ -179,7 +179,7 @@
     <property role="EcuMT" value="6733065834259138549" />
     <ref role="1TJDcQ" node="5PKDVfOlrE5" resolve="CellModel_ComponentWithParameters" />
     <node concept="PrWs8" id="5PKDVfOlsvR" role="PzmwI">
-      <ref role="PrY4T" to="tpck:8AYOKVCAP5" />
+      <ref role="PrY4T" to="tpck:8AYOKVCAP5" resolve="IStubForAnotherConcept" />
     </node>
   </node>
   <node concept="1TIwiD" id="1gBmad3Feya">
diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/typesystem.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/typesystem.mps
index f1b46ef06..7680b92c1 100644
--- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/typesystem.mps
+++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/typesystem.mps
@@ -509,7 +509,7 @@
           <node concept="2OqwBi" id="5PKDVfOmJSJ" role="33vP2m">
             <node concept="2OqwBi" id="5PKDVfOmINl" role="2Oq$k0">
               <node concept="1YBJjd" id="5PKDVfOmINm" role="2Oq$k0">
-                <ref role="1YBMHb" node="5PKDVfOmDqS" resolve="cellModel_ComponentWithParameters" />
+                <ref role="1YBMHb" node="5PKDVfOmDqS" resolve="cellModel" />
               </node>
               <node concept="3TrEf2" id="5PKDVfOmJw7" role="2OqNvi">
                 <ref role="3Tt5mk" to="91fu:fGPMmyn" resolve="editorComponent" />
@@ -529,7 +529,7 @@
           </node>
           <node concept="2OqwBi" id="5PKDVfOmLsc" role="33vP2m">
             <node concept="1YBJjd" id="5PKDVfOmLsd" role="2Oq$k0">
-              <ref role="1YBMHb" node="5PKDVfOmDqS" resolve="cellModel_ComponentWithParameters" />
+              <ref role="1YBMHb" node="5PKDVfOmDqS" resolve="cellModel" />
             </node>
             <node concept="3Tsc0h" id="5PKDVfOmLse" role="2OqNvi">
               <ref role="3TtcxE" to="91fu:5PKDVfOlsvY" resolve="arguments" />
@@ -820,7 +820,7 @@
             <node concept="2bSWHS" id="1gBmad3OmsB" role="2OqNvi" />
           </node>
           <node concept="37vLTw" id="1gBmad3OrKz" role="3uHU7B">
-            <ref role="3cqZAo" node="1gBmad3OrKv" resolve="index" />
+            <ref role="3cqZAo" node="1gBmad3OrKv" resolve="currentIndex" />
           </node>
         </node>
         <node concept="3clFbS" id="1gBmad3OjsO" role="3clFbx">
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index dc5304262..ac1adbc6f 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -3239,6 +3239,34 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="3BzrucBh1rd" role="jymVt" />
+    <node concept="3clFb_" id="3BzrucBhLNi" role="jymVt">
+      <property role="TrG5h" value="getIdeaProject" />
+      <node concept="3clFbS" id="3BzrucBhLNl" role="3clF47">
+        <node concept="3clFbF" id="3BzrucBiHWI" role="3cqZAp">
+          <node concept="2YIFZM" id="3kITFmIEFID" role="3clFbG">
+            <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
+            <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+            <node concept="2YIFZM" id="3BzrucBg3Ag" role="37wK5m">
+              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+              <ref role="37wK5l" to="alof:~ProjectHelper.getProject(org.jetbrains.mps.openapi.module.SRepository)" resolve="getProject" />
+              <node concept="2OqwBi" id="3BzrucBgFay" role="37wK5m">
+                <node concept="1rXfSq" id="3BzrucBg3Ah" role="2Oq$k0">
+                  <ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
+                </node>
+                <node concept="liA8E" id="3BzrucBgMq5" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3BzrucBhnO6" role="1B3o_S" />
+      <node concept="3uibUv" id="3BzrucBhIoE" role="3clF45">
+        <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="4dus55SGBy2" role="jymVt" />
     <node concept="3clFb_" id="6Bd7Vwq_Nhx" role="jymVt">
       <property role="TrG5h" value="getPalette" />
@@ -3253,22 +3281,8 @@
             <node concept="3uibUv" id="6Bd7VwqA68x" role="1tU5fm">
               <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
             </node>
-            <node concept="2YIFZM" id="6Bd7VwqA68y" role="33vP2m">
-              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-              <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
-              <node concept="2OqwBi" id="6Bd7VwqA68z" role="37wK5m">
-                <node concept="liA8E" id="6Bd7VwqA68_" role="2OqNvi">
-                  <ref role="37wK5l" to="w1kc:~IOperationContext.getProject()" resolve="getProject" />
-                </node>
-                <node concept="2OqwBi" id="2WtZELtyqRN" role="2Oq$k0">
-                  <node concept="1rXfSq" id="2WtZELtyqRO" role="2Oq$k0">
-                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
-                  </node>
-                  <node concept="liA8E" id="2WtZELtyqRP" role="2OqNvi">
-                    <ref role="37wK5l" to="cj4x:~EditorContext.getOperationContext()" resolve="getOperationContext" />
-                  </node>
-                </node>
-              </node>
+            <node concept="1rXfSq" id="3BzrucBjlKl" role="33vP2m">
+              <ref role="37wK5l" node="3BzrucBhLNi" resolve="getIdeaProject" />
             </node>
           </node>
         </node>
@@ -4839,22 +4853,8 @@
                 <node concept="3uibUv" id="3kITFmIEFIC" role="1tU5fm">
                   <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
                 </node>
-                <node concept="2YIFZM" id="3kITFmIEFID" role="33vP2m">
-                  <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                  <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
-                  <node concept="2OqwBi" id="2WtZELtylOw" role="37wK5m">
-                    <node concept="2OqwBi" id="2WtZELtya0I" role="2Oq$k0">
-                      <node concept="1rXfSq" id="2WtZELty8_x" role="2Oq$k0">
-                        <ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext()" resolve="getContext" />
-                      </node>
-                      <node concept="liA8E" id="2WtZELtylIL" role="2OqNvi">
-                        <ref role="37wK5l" to="cj4x:~EditorContext.getOperationContext()" resolve="getOperationContext" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="2WtZELtynhD" role="2OqNvi">
-                      <ref role="37wK5l" to="w1kc:~IOperationContext.getProject()" resolve="getProject" />
-                    </node>
-                  </node>
+                <node concept="1rXfSq" id="3BzrucBi$Ur" role="33vP2m">
+                  <ref role="37wK5l" node="3BzrucBhLNi" resolve="getIdeaProject" />
                 </node>
               </node>
             </node>
@@ -4897,7 +4897,7 @@
                             <ref role="3cqZAo" node="2mf5oprdgmL" resolve="LOG" />
                           </node>
                           <node concept="liA8E" id="5mRiQvlulG3" role="2OqNvi">
-                            <ref role="37wK5l" to="q7tw:~Category.warn(java.lang.Object)" resolve="warn" />
+                            <ref role="37wK5l" to="q7tw:~Category.debug(java.lang.Object)" resolve="debug" />
                             <node concept="Xl_RD" id="5mRiQvlulG4" role="37wK5m">
                               <property role="Xl_RC" value="Diagram palette not found in the project" />
                             </node>
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
index 15b8a9844..cf7437e6e 100644
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
@@ -594,14 +594,14 @@
       <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
-      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_IsApplicable" flags="ig" index="1eYwpX" />
-      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_Execute" flags="ig" index="1eYxTg" />
-      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2" flags="ng" index="1eYWM2">
+      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_IsApplicable" flags="ig" index="1eYwpX" />
+      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Execute" flags="ig" index="1eYxTg" />
+      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell" flags="ng" index="1eYWM2">
         <child id="4874944647490523335" name="matchingText" index="1eYxyj" />
         <child id="4874944647490523330" name="isApplicable" index="1eYxym" />
         <child id="4874944647490524677" name="execute" index="1eYxTh" />
       </concept>
-      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_MatchingText" flags="ig" index="1eYWSL" />
+      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_MatchingText" flags="ig" index="1eYWSL" />
     </language>
     <language id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell">
       <concept id="1161622981231" name="de.slisson.mps.richtext.customcell.structure.ConceptFunctionParameter_cell" flags="nn" index="1Q80Hy" />
diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps
index da3bcdd28..951c202b0 100644
--- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps
+++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps
@@ -13473,7 +13473,7 @@
                         <node concept="liA8E" id="1laD9eY9ndE" role="2OqNvi">
                           <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
                           <node concept="37vLTw" id="5nOdiEw9St2" role="37wK5m">
-                            <ref role="3cqZAo" node="5nOdiEw9SsY" resolve="i" />
+                            <ref role="3cqZAo" node="5nOdiEw9SsY" resolve="newCaretPosition" />
                           </node>
                         </node>
                       </node>
@@ -14378,7 +14378,7 @@
                 <node concept="liA8E" id="5clXe2LCjAy" role="2OqNvi">
                   <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
                   <node concept="37vLTw" id="5nOdiEwau6j" role="37wK5m">
-                    <ref role="3cqZAo" node="5nOdiEwau6c" resolve="i" />
+                    <ref role="3cqZAo" node="5nOdiEwau6c" resolve="newCaretPosition" />
                   </node>
                 </node>
               </node>
diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps
index 8905609cd..b03aa1f6b 100644
--- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps
+++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps
@@ -507,7 +507,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1bakscM2e9F" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="5LEeV$40Wi9" role="jymVt" />
@@ -538,7 +538,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1bakscM7x$L" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="3Tm1VV" id="5H3MsraaLrF" role="1B3o_S" />
diff --git a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps
index 9a976d39c..dedb4a2d8 100644
--- a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps
+++ b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps
@@ -921,7 +921,7 @@
       <node concept="3vlDli" id="2JjwJOLVT6D" role="3cqZAp">
         <node concept="2OqwBi" id="5nOdiEvxLpM" role="3tpDZB">
           <node concept="3aJYuZ" id="5nOdiEvjOau" role="2Oq$k0">
-            <ref role="3aJY3W" node="5nOdiEvjNGz" />
+            <ref role="3aJY3W" node="5nOdiEvjNGz" resolve="multiline" />
           </node>
           <node concept="liA8E" id="5nOdiEvzD1f" role="2OqNvi">
             <ref role="37wK5l" to="nv7s:5nOdiEvzBRD" resolve="getSelectionStart" />
@@ -939,7 +939,7 @@
       <node concept="3vlDli" id="2JjwJOLVT6I" role="3cqZAp">
         <node concept="2OqwBi" id="5nOdiEvxLuH" role="3tpDZB">
           <node concept="3aJYuZ" id="5nOdiEvxLtw" role="2Oq$k0">
-            <ref role="3aJY3W" node="5nOdiEvjNGz" />
+            <ref role="3aJY3W" node="5nOdiEvjNGz" resolve="multiline" />
           </node>
           <node concept="liA8E" id="5nOdiEvzDjS" role="2OqNvi">
             <ref role="37wK5l" to="nv7s:5nOdiEvzCnc" resolve="getSelectionEnd" />
@@ -1716,7 +1716,7 @@
       </node>
       <node concept="2Hmddi" id="5nOdiEvAzZX" role="3cqZAp">
         <node concept="37vLTw" id="5nOdiEvAzZY" role="2Hmdds">
-          <ref role="3cqZAo" node="5nOdiEvAzZO" resolve="selection" />
+          <ref role="3cqZAo" node="5nOdiEvAzZO" resolve="selection1" />
         </node>
       </node>
       <node concept="3clFbH" id="5nOdiEvAzZZ" role="3cqZAp" />
@@ -1731,7 +1731,7 @@
         </node>
         <node concept="2OqwBi" id="5nOdiEvA$04" role="3tpDZA">
           <node concept="37vLTw" id="5nOdiEvA$05" role="2Oq$k0">
-            <ref role="3cqZAo" node="5nOdiEvAzZO" resolve="selection" />
+            <ref role="3cqZAo" node="5nOdiEvAzZO" resolve="selection1" />
           </node>
           <node concept="liA8E" id="5nOdiEvA$06" role="2OqNvi">
             <ref role="37wK5l" to="93vl:11MD$rT$uH2" resolve="getSelectionStart" />
@@ -1749,7 +1749,7 @@
         </node>
         <node concept="2OqwBi" id="5nOdiEvA$0b" role="3tpDZA">
           <node concept="37vLTw" id="5nOdiEvA$0c" role="2Oq$k0">
-            <ref role="3cqZAo" node="5nOdiEvAzZO" resolve="selection" />
+            <ref role="3cqZAo" node="5nOdiEvAzZO" resolve="selection1" />
           </node>
           <node concept="liA8E" id="5nOdiEvA$0d" role="2OqNvi">
             <ref role="37wK5l" to="93vl:11MD$rT$uI5" resolve="getSelectionEnd" />
@@ -1788,7 +1788,7 @@
       </node>
       <node concept="2Hmddi" id="5nOdiEvA$b9" role="3cqZAp">
         <node concept="37vLTw" id="5nOdiEvA$ba" role="2Hmdds">
-          <ref role="3cqZAo" node="5nOdiEvA$b0" resolve="selection" />
+          <ref role="3cqZAo" node="5nOdiEvA$b0" resolve="selection2" />
         </node>
       </node>
       <node concept="3clFbH" id="5nOdiEvA$bb" role="3cqZAp" />
@@ -1803,7 +1803,7 @@
         </node>
         <node concept="2OqwBi" id="5nOdiEvA$bg" role="3tpDZA">
           <node concept="37vLTw" id="5nOdiEvA$bh" role="2Oq$k0">
-            <ref role="3cqZAo" node="5nOdiEvA$b0" resolve="selection" />
+            <ref role="3cqZAo" node="5nOdiEvA$b0" resolve="selection2" />
           </node>
           <node concept="liA8E" id="5nOdiEvA$bi" role="2OqNvi">
             <ref role="37wK5l" to="93vl:11MD$rT$uH2" resolve="getSelectionStart" />
@@ -1821,7 +1821,7 @@
         </node>
         <node concept="2OqwBi" id="5nOdiEvA$bn" role="3tpDZA">
           <node concept="37vLTw" id="5nOdiEvA$bo" role="2Oq$k0">
-            <ref role="3cqZAo" node="5nOdiEvA$b0" resolve="selection" />
+            <ref role="3cqZAo" node="5nOdiEvA$b0" resolve="selection2" />
           </node>
           <node concept="liA8E" id="5nOdiEvA$bp" role="2OqNvi">
             <ref role="37wK5l" to="93vl:11MD$rT$uI5" resolve="getSelectionEnd" />
diff --git a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd
index 15ffc23c7..4b322a7d7 100644
--- a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd
+++ b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd
@@ -21,6 +21,7 @@
   <languageVersions>
     <language slang="l:31c91def-a131-41a1-9018-102874f49a12:de.slisson.mps.editor.multiline" version="0" />
     <language slang="l:26a9201d-e70b-4755-acd6-40baf7a63b3a:de.slisson.mps.editor.multiline.demolang" version="0" />
+    <language slang="l:0f2ccb7a-482c-4ebf-bf26-faa5b895afe4:de.slisson.mps.editor.multiline.test" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
index de29533cd..ed195ad64 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
@@ -1732,18 +1732,28 @@
                 <node concept="1bVj0M" id="5bKNAZ5i3K$" role="23t8la">
                   <node concept="3clFbS" id="5bKNAZ5i3K_" role="1bW5cS">
                     <node concept="3clFbF" id="5bKNAZ5i3R_" role="3cqZAp">
-                      <node concept="22lmx$" id="5vc9Xxa_D9z" role="3clFbG">
-                        <node concept="37vLTw" id="5vc9Xxa_QNU" role="3uHU7w">
-                          <ref role="3cqZAo" node="5vc9Xxa$Y6e" resolve="myReadOnly" />
+                      <node concept="1Wc70l" id="1pBVZRTgSH9" role="3clFbG">
+                        <node concept="3y3z36" id="1pBVZRTgXRH" role="3uHU7B">
+                          <node concept="10Nm6u" id="1pBVZRTgYW8" role="3uHU7w" />
+                          <node concept="37vLTw" id="1pBVZRTgVIp" role="3uHU7B">
+                            <ref role="3cqZAo" node="5bKNAZ5i3KA" resolve="it" />
+                          </node>
                         </node>
-                        <node concept="3y3z36" id="5bKNAZ5i4oI" role="3uHU7B">
-                          <node concept="2OqwBi" id="5bKNAZ5i3Ya" role="3uHU7B">
-                            <node concept="37vLTw" id="5bKNAZ5i3R$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5bKNAZ5i3KA" resolve="it" />
+                        <node concept="1eOMI4" id="1pBVZRTh49H" role="3uHU7w">
+                          <node concept="22lmx$" id="5vc9Xxa_D9z" role="1eOMHV">
+                            <node concept="3y3z36" id="5bKNAZ5i4oI" role="3uHU7B">
+                              <node concept="2OqwBi" id="5bKNAZ5i3Ya" role="3uHU7B">
+                                <node concept="37vLTw" id="5bKNAZ5i3R$" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5bKNAZ5i3KA" resolve="it" />
+                                </node>
+                                <node concept="I4A8Y" id="5bKNAZ5i44q" role="2OqNvi" />
+                              </node>
+                              <node concept="10Nm6u" id="5bKNAZ5i4uL" role="3uHU7w" />
+                            </node>
+                            <node concept="37vLTw" id="5vc9Xxa_QNU" role="3uHU7w">
+                              <ref role="3cqZAo" node="5vc9Xxa$Y6e" resolve="myReadOnly" />
                             </node>
-                            <node concept="I4A8Y" id="5bKNAZ5i44q" role="2OqNvi" />
                           </node>
-                          <node concept="10Nm6u" id="5bKNAZ5i4uL" role="3uHU7w" />
                         </node>
                       </node>
                     </node>
diff --git a/code/richtext/languages/richtext/languageModels/editor.mps b/code/richtext/languages/richtext/languageModels/editor.mps
index 8fdec964a..41bf8ac14 100644
--- a/code/richtext/languages/richtext/languageModels/editor.mps
+++ b/code/richtext/languages/richtext/languageModels/editor.mps
@@ -5298,7 +5298,7 @@
                   <node concept="liA8E" id="6wQWU6B63CC" role="2OqNvi">
                     <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
                     <node concept="37vLTw" id="5nOdiEwc0Tc" role="37wK5m">
-                      <ref role="3cqZAo" node="5nOdiEwc0T6" resolve="length" />
+                      <ref role="3cqZAo" node="5nOdiEwc0T6" resolve="newCaretPosition" />
                     </node>
                   </node>
                 </node>
@@ -5332,7 +5332,7 @@
                   <ref role="3cqZAo" node="7c02HRXo4Dl" resolve="lastWord" />
                 </node>
                 <node concept="37vLTw" id="5nOdiEwc0Td" role="37wK5m">
-                  <ref role="3cqZAo" node="5nOdiEwc0T6" resolve="length" />
+                  <ref role="3cqZAo" node="5nOdiEwc0T6" resolve="newCaretPosition" />
                 </node>
               </node>
             </node>
@@ -7791,7 +7791,7 @@
                         <node concept="liA8E" id="5lBiF1A_nTs" role="2OqNvi">
                           <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
                           <node concept="37vLTw" id="5nOdiEwbHsc" role="37wK5m">
-                            <ref role="3cqZAo" node="5nOdiEwbHs6" resolve="length" />
+                            <ref role="3cqZAo" node="5nOdiEwbHs6" resolve="newCaretPosition" />
                           </node>
                         </node>
                       </node>
diff --git a/code/richtext/languages/richtext/languageModels/plugin.mps b/code/richtext/languages/richtext/languageModels/plugin.mps
index 08c4c7491..f76d2bf1d 100644
--- a/code/richtext/languages/richtext/languageModels/plugin.mps
+++ b/code/richtext/languages/richtext/languageModels/plugin.mps
@@ -1807,7 +1807,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="5nOdiEvJJ$y" role="37wK5m">
-                <ref role="3cqZAo" node="5nOdiEvJJ$j" resolve="lastCell" />
+                <ref role="3cqZAo" node="5nOdiEvJJ$j" resolve="firstCell" />
               </node>
               <node concept="3cmrfG" id="5nOdiEvJUG_" role="37wK5m">
                 <property role="3cmrfH" value="0" />
diff --git a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps
index 8aa0df01a..75fef331b 100644
--- a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps
+++ b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps
@@ -2540,7 +2540,7 @@
                         <node concept="liA8E" id="8ZBTVjWfrq" role="2OqNvi">
                           <ref role="37wK5l" to="g51k:~EditorCell_Label.setCaretPosition(int)" resolve="setCaretPosition" />
                           <node concept="37vLTw" id="5nOdiEw8xtc" role="37wK5m">
-                            <ref role="3cqZAo" node="5nOdiEw8xt3" resolve="i" />
+                            <ref role="3cqZAo" node="5nOdiEw8xt3" resolve="newCaretPosition" />
                           </node>
                         </node>
                       </node>
diff --git a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd
index c7d6975ab..3c04071bd 100644
--- a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd
+++ b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd
@@ -20,6 +20,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
     <module reference="0cca457a-289f-4811-b49b-c3b096dbf72a(third.party.usage.test)" version="0" />
   </dependencyVersions>