diff --git a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
index 96ee6036..489577ab 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -261,10 +261,6 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1179360813171" name="jetbrains.mps.baseLanguage.structure.HexIntegerLiteral" flags="nn" index="2nou5x">
@@ -302,7 +298,6 @@
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -413,9 +408,6 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
-      <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
-        <child id="1140131861877" name="replacementNode" index="1P9ThW" />
-      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -428,7 +420,6 @@
       <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
         <reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
       </concept>
-      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -1865,75 +1856,6 @@
           <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
-      <node concept="IWgqT" id="7XmdqtdOX91" role="1Qtc8A">
-        <node concept="1hCUdq" id="7XmdqtdOX93" role="1hCUd6">
-          <node concept="3clFbS" id="7XmdqtdOX95" role="2VODD2">
-            <node concept="3clFbF" id="7XmdqtdOXue" role="3cqZAp">
-              <node concept="Xl_RD" id="7XmdqtdOXud" role="3clFbG">
-                <property role="Xl_RC" value="=" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWg2L" id="7XmdqtdOX97" role="IWgqQ">
-          <node concept="3clFbS" id="7XmdqtdOX99" role="2VODD2">
-            <node concept="3cpWs8" id="4sSe4$p4w5F" role="3cqZAp">
-              <node concept="3cpWsn" id="4sSe4$p4w5G" role="3cpWs9">
-                <property role="TrG5h" value="plv" />
-                <node concept="3Tqbb2" id="4sSe4$p4w5D" role="1tU5fm">
-                  <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
-                </node>
-                <node concept="2ShNRf" id="4sSe4$p4w5H" role="33vP2m">
-                  <node concept="3zrR0B" id="4sSe4$p4w5I" role="2ShVmc">
-                    <node concept="3Tqbb2" id="4sSe4$p4w5J" role="3zrR0E">
-                      <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4sSe4$p4FXc" role="3cqZAp">
-              <node concept="2OqwBi" id="4sSe4$p4G3j" role="3clFbG">
-                <node concept="7Obwk" id="7XmdqtdP6NV" role="2Oq$k0" />
-                <node concept="1P9Npp" id="4sSe4$p4Ggq" role="2OqNvi">
-                  <node concept="37vLTw" id="4sSe4$p4Gl8" role="1P9ThW">
-                    <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4sSe4$p4vIY" role="3cqZAp">
-              <node concept="37vLTI" id="4sSe4$p4wuf" role="3clFbG">
-                <node concept="2OqwBi" id="4sSe4$p4wBZ" role="37vLTx">
-                  <node concept="7Obwk" id="7XmdqtdP6Oq" role="2Oq$k0" />
-                  <node concept="3YRAZt" id="4sSe4$p4wJS" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="4sSe4$p4we2" role="37vLTJ">
-                  <node concept="37vLTw" id="4sSe4$p4w5K" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
-                  </node>
-                  <node concept="3TrEf2" id="4sSe4$p4wkM" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:4sSe4$p4oON" resolve="variable" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4sSe4$p4wSN" role="3cqZAp">
-              <node concept="2OqwBi" id="7XmdqtdPl4B" role="3clFbG">
-                <node concept="2OqwBi" id="4sSe4$p4wYQ" role="2Oq$k0">
-                  <node concept="37vLTw" id="4sSe4$p4wSL" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
-                  </node>
-                  <node concept="3TrEf2" id="4sSe4$p4x9l" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:4sSe4$p4oOP" resolve="value" />
-                  </node>
-                </node>
-                <node concept="2DeJnY" id="7XmdqtdPlo$" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="IWgqT" id="7XmdqtdOVNH" role="1Qtc8A">
         <node concept="1hCUdq" id="7XmdqtdOVNJ" role="1hCUd6">
           <node concept="3clFbS" id="7XmdqtdOVNL" role="2VODD2">
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
index c709ce52..0382ba66 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -10,6 +10,7 @@
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
+      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="6054523464626862044" name="jetbrains.mps.lang.structure.structure.AttributeInfo_IsMultiple" flags="ng" index="tn0Fv">
         <property id="6054523464626875854" name="value" index="tnX3d" />
       </concept>
@@ -338,6 +339,7 @@
       <property role="IQ2ns" value="5131913661993028917" />
       <ref role="20lvS9" node="7E86$tKsl45" resolve="LogicalItem" />
     </node>
+    <node concept="asaX9" id="1mdVbTS8GIW" role="lGtFl" />
   </node>
   <node concept="1TIwiD" id="5NAQwIkRIXT">
     <property role="EcuMT" value="6694277639409954681" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 6ef7094c..fe597fbe 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -4348,8 +4348,8 @@
                             <ref role="3cqZAo" node="4sSe4$p4Z8a" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="4sSe4$p4Z88" role="2OqNvi">
-                            <node concept="chp4Y" id="4sSe4$pmZYT" role="cj9EA">
-                              <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                            <node concept="chp4Y" id="1mdVbTS8Lqa" role="cj9EA">
+                              <ref role="cht4Q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
                             </node>
                           </node>
                         </node>
@@ -4460,12 +4460,12 @@
                                                 <node concept="37vLTw" id="4sSe4$p5z8y" role="1m5AlR">
                                                   <ref role="3cqZAo" node="4sSe4$p5z8D" resolve="it" />
                                                 </node>
-                                                <node concept="chp4Y" id="6fXjIfxgng2" role="3oSUPX">
-                                                  <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                                                <node concept="chp4Y" id="1mdVbTS8Pgm" role="3oSUPX">
+                                                  <ref role="cht4Q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
                                                 </node>
                                               </node>
-                                              <node concept="3TrEf2" id="4sSe4$p8ymx" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="5j4j:4sSe4$p4oOP" resolve="value" />
+                                              <node concept="3TrEf2" id="1mdVbTSeqv8" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="wq2x:4sSe4$p4oOP" resolve="value" />
                                               </node>
                                             </node>
                                             <node concept="37vLTw" id="4sSe4$p5z8$" role="3K4GZi">
@@ -4476,8 +4476,8 @@
                                                 <ref role="3cqZAo" node="4sSe4$p5z8D" resolve="it" />
                                               </node>
                                               <node concept="1mIQ4w" id="4sSe4$p5z8B" role="2OqNvi">
-                                                <node concept="chp4Y" id="4sSe4$p5z8C" role="cj9EA">
-                                                  <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                                                <node concept="chp4Y" id="1mdVbTS8PKO" role="cj9EA">
+                                                  <ref role="cht4Q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
                                                 </node>
                                               </node>
                                             </node>
@@ -4523,12 +4523,12 @@
                                               <node concept="37vLTw" id="4sSe4$p5s25" role="1m5AlR">
                                                 <ref role="3cqZAo" node="4sSe4$p5lcB" resolve="it" />
                                               </node>
-                                              <node concept="chp4Y" id="6fXjIfxgnfO" role="3oSUPX">
-                                                <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                                              <node concept="chp4Y" id="1mdVbTS8QrK" role="3oSUPX">
+                                                <ref role="cht4Q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
                                               </node>
                                             </node>
-                                            <node concept="3TrEf2" id="4sSe4$p8$9K" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="5j4j:4sSe4$p4oON" resolve="variable" />
+                                            <node concept="3TrEf2" id="1mdVbTSer2h" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="wq2x:4sSe4$p4oON" resolve="variable" />
                                             </node>
                                           </node>
                                           <node concept="2c44tf" id="4sSe4$p6FmY" role="3K4GZi">
@@ -4539,8 +4539,8 @@
                                               <ref role="3cqZAo" node="4sSe4$p5lcB" resolve="it" />
                                             </node>
                                             <node concept="1mIQ4w" id="4sSe4$p5odr" role="2OqNvi">
-                                              <node concept="chp4Y" id="4sSe4$p5pHN" role="cj9EA">
-                                                <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                                              <node concept="chp4Y" id="1mdVbTS8QRy" role="cj9EA">
+                                                <ref role="cht4Q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
                                               </node>
                                             </node>
                                           </node>
@@ -4589,8 +4589,8 @@
                           <ref role="3cqZAo" node="4sSe4$p51UM" resolve="it" />
                         </node>
                         <node concept="1mIQ4w" id="4sSe4$p51UK" role="2OqNvi">
-                          <node concept="chp4Y" id="4sSe4$pn0PY" role="cj9EA">
-                            <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                          <node concept="chp4Y" id="1mdVbTS8LHN" role="cj9EA">
+                            <ref role="cht4Q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
                           </node>
                         </node>
                       </node>
@@ -17445,8 +17445,8 @@
                                         <node concept="30H73N" id="Lu45F7Wvn8" role="2Oq$k0" />
                                         <node concept="2Xjw5R" id="Lu45F7WvT1" role="2OqNvi">
                                           <node concept="1xMEDy" id="Lu45F7WvT3" role="1xVPHs">
-                                            <node concept="chp4Y" id="Lu45F7Ww0Y" role="ri$Ld">
-                                              <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                                            <node concept="chp4Y" id="1mdVbTS8Nzk" role="ri$Ld">
+                                              <ref role="cht4Q" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
                                             </node>
                                           </node>
                                         </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 87023e12..43d85725 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.lang.typesystem2" uuid="c4803b19-6d89-4a3b-bf82-390769514add" languageVersion="8" moduleVersion="0">
+<language namespace="jetbrains.mps.lang.typesystem2" uuid="c4803b19-6d89-4a3b-bf82-390769514add" languageVersion="9" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 55223de7..79ec4b1e 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -287,6 +287,9 @@
       <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
+      <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
+        <child id="6718020819489956031" name="menuReference" index="AmTjC" />
+      </concept>
       <concept id="6684862045052272180" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_NodeToWrap" flags="ng" index="3N4pyC" />
       <concept id="6684862045052059649" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_WrapperHandler" flags="ig" index="3N5aqt" />
       <concept id="6684862045052059291" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Wrapper" flags="ng" index="3N5dw7">
@@ -494,6 +497,9 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
+      <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
+        <child id="1140131861877" name="replacementNode" index="1P9ThW" />
+      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
@@ -7607,5 +7613,124 @@
     <ref role="aqKnT" to="wq2x:20Ay2VefOqF" resolve="LogicalClause" />
     <node concept="2VfDsV" id="1mdVbTRQZXE" role="3ft7WO" />
   </node>
+  <node concept="24kQdi" id="1mdVbTS8GMM">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="1XX52x" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
+    <node concept="3EZMnI" id="4sSe4$p4oOZ" role="2wV5jI">
+      <node concept="3F1sOY" id="4sSe4$p4oPk" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:4sSe4$p4oON" resolve="variable" />
+      </node>
+      <node concept="3F0ifn" id="4sSe4$p4oPc" role="3EZMnx">
+        <property role="3F0ifm" value="=" />
+        <ref role="1k5W1q" to="tpen:hF$iUjy" resolve="Operator" />
+      </node>
+      <node concept="3F1sOY" id="4sSe4$p4oP6" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:4sSe4$p4oOP" resolve="value" />
+      </node>
+      <node concept="l2Vlx" id="4sSe4$p4oP2" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3INDKC" id="1mdVbTS8NQ0">
+    <property role="3GE5qa" value="constraint" />
+    <property role="TrG5h" value="SubstitutePattern" />
+    <node concept="1Qtc8_" id="1mdVbTS8Ouv" role="IW6Ez">
+      <node concept="IWgqT" id="7XmdqtdOX91" role="1Qtc8A">
+        <node concept="1hCUdq" id="7XmdqtdOX93" role="1hCUd6">
+          <node concept="3clFbS" id="7XmdqtdOX95" role="2VODD2">
+            <node concept="3clFbF" id="7XmdqtdOXue" role="3cqZAp">
+              <node concept="Xl_RD" id="7XmdqtdOXud" role="3clFbG">
+                <property role="Xl_RC" value="=" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="7XmdqtdOX97" role="IWgqQ">
+          <node concept="3clFbS" id="7XmdqtdOX99" role="2VODD2">
+            <node concept="3cpWs8" id="4sSe4$p4w5F" role="3cqZAp">
+              <node concept="3cpWsn" id="4sSe4$p4w5G" role="3cpWs9">
+                <property role="TrG5h" value="plv" />
+                <node concept="3Tqbb2" id="4sSe4$p4w5D" role="1tU5fm">
+                  <ref role="ehGHo" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
+                </node>
+                <node concept="2ShNRf" id="4sSe4$p4w5H" role="33vP2m">
+                  <node concept="3zrR0B" id="4sSe4$p4w5I" role="2ShVmc">
+                    <node concept="3Tqbb2" id="4sSe4$p4w5J" role="3zrR0E">
+                      <ref role="ehGHo" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="4sSe4$p4FXc" role="3cqZAp">
+              <node concept="2OqwBi" id="4sSe4$p4G3j" role="3clFbG">
+                <node concept="7Obwk" id="7XmdqtdP6NV" role="2Oq$k0" />
+                <node concept="1P9Npp" id="4sSe4$p4Ggq" role="2OqNvi">
+                  <node concept="37vLTw" id="4sSe4$p4Gl8" role="1P9ThW">
+                    <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="4sSe4$p4vIY" role="3cqZAp">
+              <node concept="37vLTI" id="4sSe4$p4wuf" role="3clFbG">
+                <node concept="2OqwBi" id="4sSe4$p4wBZ" role="37vLTx">
+                  <node concept="7Obwk" id="7XmdqtdP6Oq" role="2Oq$k0" />
+                  <node concept="3YRAZt" id="4sSe4$p4wJS" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="4sSe4$p4we2" role="37vLTJ">
+                  <node concept="37vLTw" id="4sSe4$p4w5K" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
+                  </node>
+                  <node concept="3TrEf2" id="1mdVbTSjbAT" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:4sSe4$p4oON" resolve="variable" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="4sSe4$p4wSN" role="3cqZAp">
+              <node concept="2OqwBi" id="7XmdqtdPl4B" role="3clFbG">
+                <node concept="2OqwBi" id="4sSe4$p4wYQ" role="2Oq$k0">
+                  <node concept="37vLTw" id="4sSe4$p4wSL" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
+                  </node>
+                  <node concept="3TrEf2" id="1mdVbTSjbNA" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:4sSe4$p4oOP" resolve="value" />
+                  </node>
+                </node>
+                <node concept="2DeJnY" id="7XmdqtdPlo$" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="1mdVbTSjNcX" role="2jiSrf">
+          <node concept="3clFbS" id="1mdVbTSjNcY" role="2VODD2">
+            <node concept="3clFbF" id="1mdVbTSjNn4" role="3cqZAp">
+              <node concept="2OqwBi" id="1mdVbTSjOtU" role="3clFbG">
+                <node concept="2OqwBi" id="1mdVbTSjN$i" role="2Oq$k0">
+                  <node concept="7Obwk" id="1mdVbTSjNn3" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="1mdVbTSjO0b" role="2OqNvi">
+                    <node concept="1xMEDy" id="1mdVbTSjO0d" role="1xVPHs">
+                      <node concept="chp4Y" id="1mdVbTSjOb7" role="ri$Ld">
+                        <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="1mdVbTSjOYv" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cWJ9i" id="1mdVbTS8OFI" role="1Qtc8$">
+        <node concept="CtIbL" id="1mdVbTS8OFK" role="CtIbM">
+          <property role="CtIbK" value="RIGHT" />
+        </node>
+      </node>
+    </node>
+    <node concept="A1WHr" id="1mdVbTS8NQ2" role="AmTjC">
+      <ref role="2ZyFGn" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
index 42e06c69..bd19ca2d 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
@@ -289,12 +289,12 @@
           <node concept="3cpWsn" id="4sSe4$p4w5G" role="3cpWs9">
             <property role="TrG5h" value="plv" />
             <node concept="3Tqbb2" id="4sSe4$p4w5D" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+              <ref role="ehGHo" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
             </node>
             <node concept="2ShNRf" id="4sSe4$p4w5H" role="33vP2m">
               <node concept="3zrR0B" id="4sSe4$p4w5I" role="2ShVmc">
                 <node concept="3Tqbb2" id="4sSe4$p4w5J" role="3zrR0E">
-                  <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                  <ref role="ehGHo" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
                 </node>
               </node>
             </node>
@@ -321,7 +321,7 @@
                 <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
               </node>
               <node concept="3TrEf2" id="4sSe4$p4wkM" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:4sSe4$p4oON" resolve="variable" />
+                <ref role="3Tt5mk" to="wq2x:4sSe4$p4oON" resolve="variable" />
               </node>
             </node>
           </node>
@@ -340,7 +340,7 @@
                 <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
               </node>
               <node concept="3TrEf2" id="4sSe4$p4x9l" role="2OqNvi">
-                <ref role="3Tt5mk" to="5j4j:4sSe4$p4oOP" resolve="value" />
+                <ref role="3Tt5mk" to="wq2x:4sSe4$p4oOP" resolve="value" />
               </node>
             </node>
           </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps
index 26e7a66f..f32d3f55 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps
@@ -5,6 +5,8 @@
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="2" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="1" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -22,7 +24,7 @@
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" implicit="true" />
+    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -146,6 +148,9 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
+      <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
+        <child id="1140725362529" name="linkTarget" index="2oxUTC" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -161,10 +166,18 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1139867745658" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithNewOperation" flags="nn" index="1_qnLN">
+        <reference id="1139867957129" name="concept" index="1_rbq0" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
       <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
@@ -878,5 +891,199 @@
       <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
     </node>
   </node>
+  <node concept="3SyAh_" id="1mdVbTSaaj9">
+    <property role="qMTe8" value="8" />
+    <property role="TrG5h" value="ReplaceDeprecatedPatternLogicalVariable" />
+    <node concept="3Tm1VV" id="1mdVbTSaaja" role="1B3o_S" />
+    <node concept="3tTeZs" id="1mdVbTSaajb" role="jymVt">
+      <property role="3tTeZt" value="&lt;no execute after&gt;" />
+      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
+    </node>
+    <node concept="3tTeZs" id="1mdVbTSaajc" role="jymVt">
+      <property role="3tTeZt" value="&lt;no required data&gt;" />
+      <ref role="3tTeZr" to="slm6:3A3gNhf1WPI" resolve="requires data" />
+    </node>
+    <node concept="3tTeZs" id="1mdVbTSaajd" role="jymVt">
+      <property role="3tTeZt" value="&lt;no produced data&gt;" />
+      <ref role="3tTeZr" to="slm6:536fTXa4WHO" resolve="produces data" />
+    </node>
+    <node concept="2tJIrI" id="1mdVbTSaaje" role="jymVt" />
+    <node concept="3tYpMH" id="1mdVbTSaatA" role="jymVt">
+      <property role="TrG5h" value="isRerunnable" />
+      <property role="3tYpME" value="true" />
+      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
+      <node concept="3Tm1VV" id="1mdVbTSaatC" role="1B3o_S" />
+      <node concept="10P_77" id="1mdVbTSaatD" role="1tU5fm" />
+    </node>
+    <node concept="3tYpXE" id="1mdVbTSaauh" role="jymVt">
+      <property role="TrG5h" value="description" />
+      <property role="3tYpXF" value="Replace instances of deprecated concept PatternLogicalVariable" />
+      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
+      <node concept="3Tm1VV" id="1mdVbTSaauj" role="1B3o_S" />
+      <node concept="17QB3L" id="1mdVbTSaauk" role="1tU5fm" />
+    </node>
+    <node concept="q3mfD" id="1mdVbTSaajh" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
+      <node concept="3Tm1VV" id="1mdVbTSaajj" role="1B3o_S" />
+      <node concept="3clFbS" id="1mdVbTSaajl" role="3clF47">
+        <node concept="3clFbH" id="1mdVbTSal$Z" role="3cqZAp" />
+        <node concept="3cpWs8" id="1mdVbTSaaJ_" role="3cqZAp">
+          <node concept="3cpWsn" id="1mdVbTSaaJA" role="3cpWs9">
+            <property role="TrG5h" value="instances" />
+            <node concept="3uibUv" id="1mdVbTSaaJB" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
+              <node concept="3Tqbb2" id="1mdVbTSaaJC" role="11_B2D" />
+            </node>
+            <node concept="2OqwBi" id="1mdVbTSaaJD" role="33vP2m">
+              <node concept="2YIFZM" id="1mdVbTSaaJE" role="2Oq$k0">
+                <ref role="1Pybhc" to="lui2:~FindUsagesFacade" resolve="FindUsagesFacade" />
+                <ref role="37wK5l" to="lui2:~FindUsagesFacade.getInstance():org.jetbrains.mps.openapi.module.FindUsagesFacade" resolve="getInstance" />
+              </node>
+              <node concept="liA8E" id="1mdVbTSaaJF" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~FindUsagesFacade.findInstances(org.jetbrains.mps.openapi.module.SearchScope,java.util.Set,boolean,org.jetbrains.mps.openapi.util.ProgressMonitor):java.util.Set" resolve="findInstances" />
+                <node concept="2ShNRf" id="1mdVbTSaaJG" role="37wK5m">
+                  <node concept="1pGfFk" id="1mdVbTSaaJH" role="2ShVmc">
+                    <ref role="37wK5l" to="mte5:~ModulesScope.&lt;init&gt;(org.jetbrains.mps.openapi.module.SModule...)" resolve="ModulesScope" />
+                    <node concept="37vLTw" id="1mdVbTSaaJI" role="37wK5m">
+                      <ref role="3cqZAo" node="1mdVbTSaajn" resolve="m" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="1mdVbTSaaJJ" role="37wK5m">
+                  <node concept="2i4dXS" id="1mdVbTSaaJK" role="2ShVmc">
+                    <node concept="35c_gC" id="1mdVbTSaaJL" role="HW$Y0">
+                      <ref role="35c_gD" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                    </node>
+                    <node concept="3uibUv" id="1mdVbTSaaJM" role="HW$YZ">
+                      <ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbT" id="1mdVbTSaaJN" role="37wK5m">
+                  <property role="3clFbU" value="false" />
+                </node>
+                <node concept="2ShNRf" id="1mdVbTSaaJO" role="37wK5m">
+                  <node concept="1pGfFk" id="1mdVbTSaaJP" role="2ShVmc">
+                    <ref role="37wK5l" to="mk8z:~EmptyProgressMonitor.&lt;init&gt;()" resolve="EmptyProgressMonitor" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="1mdVbTSabTU" role="3cqZAp">
+          <node concept="3clFbS" id="1mdVbTSabTX" role="2LFqv$">
+            <node concept="3cpWs8" id="1mdVbTSah6f" role="3cqZAp">
+              <node concept="3cpWsn" id="1mdVbTSah6g" role="3cpWs9">
+                <property role="TrG5h" value="old" />
+                <node concept="3Tqbb2" id="1mdVbTSah6c" role="1tU5fm">
+                  <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                </node>
+                <node concept="1PxgMI" id="1mdVbTSah6h" role="33vP2m">
+                  <property role="1BlNFB" value="true" />
+                  <node concept="chp4Y" id="1mdVbTSah6i" role="3oSUPX">
+                    <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
+                  </node>
+                  <node concept="37vLTw" id="1mdVbTSah6j" role="1m5AlR">
+                    <ref role="3cqZAo" node="1mdVbTSabTY" resolve="n" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="1mdVbTSae8z" role="3cqZAp">
+              <node concept="3cpWsn" id="1mdVbTSae8$" role="3cpWs9">
+                <property role="TrG5h" value="plv" />
+                <node concept="3Tqbb2" id="1mdVbTSae8y" role="1tU5fm">
+                  <ref role="ehGHo" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
+                </node>
+                <node concept="2OqwBi" id="1mdVbTSae8_" role="33vP2m">
+                  <node concept="1_qnLN" id="1mdVbTSae8B" role="2OqNvi">
+                    <ref role="1_rbq0" to="wq2x:1mdVbTS8GIV" resolve="PatternLogicalVariable" />
+                  </node>
+                  <node concept="37vLTw" id="1mdVbTSahd_" role="2Oq$k0">
+                    <ref role="3cqZAo" node="1mdVbTSah6g" resolve="old" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="1mdVbTSadCx" role="3cqZAp">
+              <node concept="2OqwBi" id="1mdVbTSaeTI" role="3clFbG">
+                <node concept="2OqwBi" id="1mdVbTSaekK" role="2Oq$k0">
+                  <node concept="37vLTw" id="1mdVbTSae8C" role="2Oq$k0">
+                    <ref role="3cqZAo" node="1mdVbTSae8$" resolve="plv" />
+                  </node>
+                  <node concept="3TrEf2" id="1mdVbTSaeyS" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:4sSe4$p4oOP" resolve="value" />
+                  </node>
+                </node>
+                <node concept="2oxUTD" id="1mdVbTSaf9w" role="2OqNvi">
+                  <node concept="2OqwBi" id="1mdVbTSai7q" role="2oxUTC">
+                    <node concept="2OqwBi" id="1mdVbTSahzc" role="2Oq$k0">
+                      <node concept="37vLTw" id="1mdVbTSahqp" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1mdVbTSah6g" resolve="old" />
+                      </node>
+                      <node concept="3TrEf2" id="1mdVbTSahLX" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:4sSe4$p4oOP" resolve="value" />
+                      </node>
+                    </node>
+                    <node concept="3YRAZt" id="1mdVbTSaiAA" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="1mdVbTSaiHw" role="3cqZAp">
+              <node concept="2OqwBi" id="1mdVbTSajry" role="3clFbG">
+                <node concept="2OqwBi" id="1mdVbTSaiPT" role="2Oq$k0">
+                  <node concept="37vLTw" id="1mdVbTSaiHu" role="2Oq$k0">
+                    <ref role="3cqZAo" node="1mdVbTSae8$" resolve="plv" />
+                  </node>
+                  <node concept="3TrEf2" id="1mdVbTSaj42" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:4sSe4$p4oON" resolve="variable" />
+                  </node>
+                </node>
+                <node concept="2oxUTD" id="1mdVbTSajWr" role="2OqNvi">
+                  <node concept="2OqwBi" id="1mdVbTSakYs" role="2oxUTC">
+                    <node concept="2OqwBi" id="1mdVbTSak85" role="2Oq$k0">
+                      <node concept="37vLTw" id="1mdVbTSajXD" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1mdVbTSah6g" resolve="old" />
+                      </node>
+                      <node concept="3TrEf2" id="1mdVbTSakAf" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:4sSe4$p4oON" resolve="variable" />
+                      </node>
+                    </node>
+                    <node concept="3YRAZt" id="1mdVbTSalxL" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="1mdVbTSabTY" role="1Duv9x">
+            <property role="TrG5h" value="n" />
+            <node concept="3Tqbb2" id="1mdVbTSabU2" role="1tU5fm" />
+          </node>
+          <node concept="37vLTw" id="1mdVbTSabU3" role="1DdaDG">
+            <ref role="3cqZAo" node="1mdVbTSaaJA" resolve="instances" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="1mdVbTSab7s" role="3cqZAp" />
+      </node>
+      <node concept="ffn8J" id="1mdVbTSaajn" role="3clF46">
+        <property role="TrG5h" value="m" />
+        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
+        <node concept="3uibUv" id="1mdVbTSaajm" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="q3mfm" id="1mdVbTSaajo" role="3clF45">
+        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
+        <ref role="1QQUv3" node="1mdVbTSaajh" resolve="execute" />
+      </node>
+    </node>
+    <node concept="3tTeZs" id="1mdVbTSaajp" role="jymVt">
+      <property role="3tTeZt" value="&lt;no result checking&gt;" />
+      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 8db02b22..d653a041 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -1547,5 +1547,25 @@
       <property role="1uS6qv" value="error" />
     </node>
   </node>
+  <node concept="1TIwiD" id="1mdVbTS8GIV">
+    <property role="EcuMT" value="1553157749316176827" />
+    <property role="3GE5qa" value="constraint" />
+    <property role="TrG5h" value="PatternLogicalVariable" />
+    <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+    <node concept="1TJgyj" id="4sSe4$p4oON" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="variable" />
+      <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5131913661993028915" />
+      <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+    </node>
+    <node concept="1TJgyj" id="4sSe4$p4oOP" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="value" />
+      <property role="20lbJX" value="1" />
+      <property role="IQ2ns" value="5131913661993028917" />
+      <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+    </node>
+  </node>
 </model>