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/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 ddfac9870..35437cb7d 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/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..f06c6cb16 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
@@ -24,10 +24,7 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="461n" ref="r:3b46a963-6deb-4d82-bdc0-36b5d9297fcf(de.slisson.mps.conditionalEditor.hints.editor)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
-    <import index="iwf0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.descriptor(MPS.Editor/)" />
     <import index="6f4m" ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e/r:f69c3fa1-0e30-4980-84e2-190ae44e4c3d(jetbrains.mps.lang.migration.runtime/jetbrains.mps.lang.migration.runtime.base)" />
-    <import index="fwk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.textgen.trace(MPS.Core/)" />
-    <import index="ao3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.text(MPS.Core/)" />
     <import index="qvne" ref="r:8ff33705-85bf-4855-805c-06d68fbe233c(jetbrains.mps.editor.runtime.descriptor)" />
     <import index="91fu" ref="r:8d20232d-87e2-425b-b4d7-a9790e401b85(de.slisson.mps.conditionalEditor.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -449,7 +446,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 +1756,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/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/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl b/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl
index a83af8c08..05ce4b17a 100644
--- a/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl
+++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl
@@ -61,7 +61,6 @@
         <module reference="4d85eeef-d68a-427d-9cc4-affb33d97d23(de.slisson.mps.editor.multiline.test.generator)" version="0" />
         <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
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/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl b/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl
index 709231fac..737e23c53 100644
--- a/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl
+++ b/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl
@@ -54,7 +54,6 @@
         <module reference="b90f8d6b-a501-4cc1-a716-6ca7f8c536f8(de.slisson.mps.richtext.test.generator)" version="0" />
         <module reference="e85618c0-260a-4538-97d6-32f6c5e74e74(de.slisson.mps.richtext.test.runtime)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
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>
diff --git a/scripts/build.xml b/scripts/build.xml
index 1cadf9b93..249ae8e59 100644
--- a/scripts/build.xml
+++ b/scripts/build.xml
@@ -52,6 +52,7 @@
           <language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
           <language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
           <language id="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" />
+          <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
         </uses>
         <classpath>
           <entry path="." />