diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 5fd3c295..2797b4f8 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -3309,13 +3309,9 @@
                             </node>
                             <node concept="nsMwS" id="53tmmMsjYXT" role="ns1xD">
                               <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
-                              <node concept="1nq8_$" id="53tmmMsjYXY" role="nsMwV">
-                                <node concept="37jhX" id="53tmmMsqwaf" role="1nq8_t">
-                                  <node concept="1nq8_$" id="53tmmMsqwae" role="37jj2">
-                                    <node concept="a7P8L" id="53tmmMsqwad" role="1nq8_t">
-                                      <ref role="a7OzE" node="53tmmMsqqLO" resolve="ClsTySubs" />
-                                    </node>
-                                  </node>
+                              <node concept="1nq8_$" id="3hZrJU5Y0_X" role="nsMwV">
+                                <node concept="a7P8L" id="3hZrJU5Y0_W" role="1nq8_t">
+                                  <ref role="a7OzE" node="53tmmMsqqLO" resolve="ClsTySubs" />
                                 </node>
                               </node>
                             </node>
@@ -3925,21 +3921,6 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="53tmmMs$6_N" role="3cqZAp">
-          <node concept="3cpWsn" id="53tmmMs$6_O" role="3cpWs9">
-            <property role="TrG5h" value="contextTvds" />
-            <node concept="2I9FWS" id="53tmmMs$6_P" role="1tU5fm">
-              <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-            </node>
-            <node concept="2ShNRf" id="53tmmMs$86s" role="33vP2m">
-              <node concept="2T8Vx0" id="53tmmMs$9qU" role="2ShVmc">
-                <node concept="2I9FWS" id="53tmmMs$9qW" role="2T96Bj">
-                  <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="4xoHD1G0$4F" role="3cqZAp">
           <node concept="3cpWsn" id="4xoHD1G0$4I" role="3cpWs9">
             <property role="TrG5h" value="tyArgs" />
@@ -3976,87 +3957,89 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="53tmmMszqKz" role="3cqZAp">
-          <node concept="3clFbS" id="53tmmMszqK_" role="3clFbx">
-            <node concept="3SKdUt" id="53tmmMs_akV" role="3cqZAp">
-              <node concept="1PaTwC" id="53tmmMs_akW" role="1aUNEU">
-                <node concept="3oM_SD" id="53tmmMs_akX" role="1PaTwD">
-                  <property role="3oM_SC" value="todo:" />
-                </node>
-                <node concept="3oM_SD" id="53tmmMs_bmZ" role="1PaTwD">
-                  <property role="3oM_SC" value="nested" />
-                </node>
-                <node concept="3oM_SD" id="53tmmMs_bPz" role="1PaTwD">
-                  <property role="3oM_SC" value="generic" />
-                </node>
-                <node concept="3oM_SD" id="53tmmMs_cMn" role="1PaTwD">
-                  <property role="3oM_SC" value="new" />
-                </node>
-                <node concept="3oM_SD" id="53tmmMs_dgO" role="1PaTwD">
-                  <property role="3oM_SC" value="class" />
-                </node>
+        <node concept="3cpWs8" id="53tmmMsz1bP" role="3cqZAp">
+          <node concept="3cpWsn" id="53tmmMsz1bS" role="3cpWs9">
+            <property role="TrG5h" value="operandCtx" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3Tqbb2" id="53tmmMsz1bN" role="1tU5fm" />
+            <node concept="3K4zz7" id="3hZrJU616F6" role="33vP2m">
+              <node concept="10Nm6u" id="3hZrJU6173y" role="3K4GZi" />
+              <node concept="37vLTw" id="3hZrJU616gX" role="3K4Cdx">
+                <ref role="3cqZAo" node="53tmmMsyoOs" resolve="isNested" />
               </node>
-            </node>
-            <node concept="3cpWs8" id="53tmmMsz1bP" role="3cqZAp">
-              <node concept="3cpWsn" id="53tmmMsz1bS" role="3cpWs9">
-                <property role="TrG5h" value="operandCtx" />
-                <node concept="3Tqbb2" id="53tmmMsz1bN" role="1tU5fm" />
-                <node concept="2OqwBi" id="53tmmMsyZ5U" role="33vP2m">
-                  <node concept="2qgKlT" id="53tmmMsz024" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
+              <node concept="2OqwBi" id="53tmmMsyZ5U" role="3K4E3e">
+                <node concept="2qgKlT" id="53tmmMsz024" role="2OqNvi">
+                  <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
+                </node>
+                <node concept="1PxgMI" id="53tmmMszzhO" role="2Oq$k0">
+                  <node concept="chp4Y" id="53tmmMsz$ti" role="3oSUPX">
+                    <ref role="cht4Q" to="tpee:6kfBYRWHrp$" resolve="NestedNewExpression" />
                   </node>
-                  <node concept="1PxgMI" id="53tmmMszzhO" role="2Oq$k0">
-                    <node concept="chp4Y" id="53tmmMsz$ti" role="3oSUPX">
-                      <ref role="cht4Q" to="tpee:6kfBYRWHrp$" resolve="NestedNewExpression" />
+                  <node concept="2OqwBi" id="53tmmMszxRj" role="1m5AlR">
+                    <node concept="3A2sRY" id="53tmmMszxJ3" role="2Oq$k0">
+                      <ref role="3A2yKK" node="4xoHD1G0uJX" resolve="dcc" />
                     </node>
-                    <node concept="2OqwBi" id="53tmmMszxRj" role="1m5AlR">
-                      <node concept="3A2sRY" id="53tmmMszxJ3" role="2Oq$k0">
-                        <ref role="3A2yKK" node="4xoHD1G0uJX" resolve="dcc" />
-                      </node>
-                      <node concept="1mfA1w" id="53tmmMszy6I" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="53tmmMszArC" role="3cqZAp">
-              <node concept="3cpWsn" id="53tmmMszArF" role="3cpWs9">
-                <property role="TrG5h" value="clsContext" />
-                <node concept="3Tqbb2" id="53tmmMszArA" role="1tU5fm">
-                  <ref role="ehGHo" to="tpee:g96eOhU" resolve="GenericDeclaration" />
-                </node>
-                <node concept="2OqwBi" id="53tmmMszEUU" role="33vP2m">
-                  <node concept="37vLTw" id="53tmmMszEMn" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4xoHD1G0Ncl" resolve="cls" />
-                  </node>
-                  <node concept="2Xjw5R" id="53tmmMszG2$" role="2OqNvi">
-                    <node concept="1xMEDy" id="53tmmMszG2A" role="1xVPHs">
-                      <node concept="chp4Y" id="53tmmMszJqP" role="ri$Ld">
-                        <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="53tmmMs$dSm" role="3cqZAp">
-              <node concept="37vLTI" id="53tmmMs$hmm" role="3clFbG">
-                <node concept="37vLTw" id="53tmmMs$eY5" role="37vLTJ">
-                  <ref role="3cqZAo" node="53tmmMs$6_O" resolve="contextTvds" />
-                </node>
-                <node concept="2OqwBi" id="53tmmMszTGm" role="37vLTx">
-                  <node concept="37vLTw" id="53tmmMszS$Z" role="2Oq$k0">
-                    <ref role="3cqZAo" node="53tmmMszArF" resolve="clsContext" />
-                  </node>
-                  <node concept="3Tsc0h" id="53tmmMszTHA" role="2OqNvi">
-                    <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                    <node concept="1mfA1w" id="53tmmMszy6I" role="2OqNvi" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="37vLTw" id="53tmmMszrOH" role="3clFbw">
-            <ref role="3cqZAo" node="53tmmMsyoOs" resolve="isNested" />
+        </node>
+        <node concept="3cpWs8" id="53tmmMszArC" role="3cqZAp">
+          <node concept="3cpWsn" id="53tmmMszArF" role="3cpWs9">
+            <property role="TrG5h" value="clsContext" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3Tqbb2" id="53tmmMszArA" role="1tU5fm">
+              <ref role="ehGHo" to="tpee:g96eOhU" resolve="GenericDeclaration" />
+            </node>
+            <node concept="3K4zz7" id="3hZrJU617x4" role="33vP2m">
+              <node concept="10Nm6u" id="3hZrJU617EB" role="3K4GZi" />
+              <node concept="37vLTw" id="3hZrJU6178$" role="3K4Cdx">
+                <ref role="3cqZAo" node="53tmmMsyoOs" resolve="isNested" />
+              </node>
+              <node concept="2OqwBi" id="53tmmMszEUU" role="3K4E3e">
+                <node concept="37vLTw" id="53tmmMszEMn" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4xoHD1G0Ncl" resolve="cls" />
+                </node>
+                <node concept="2Xjw5R" id="53tmmMszG2$" role="2OqNvi">
+                  <node concept="1xMEDy" id="53tmmMszG2A" role="1xVPHs">
+                    <node concept="chp4Y" id="53tmmMszJqP" role="ri$Ld">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="53tmmMs$6_N" role="3cqZAp">
+          <node concept="3cpWsn" id="53tmmMs$6_O" role="3cpWs9">
+            <property role="TrG5h" value="contextTvds" />
+            <property role="3TUv4t" value="true" />
+            <node concept="2I9FWS" id="53tmmMs$6_P" role="1tU5fm">
+              <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+            </node>
+            <node concept="3K4zz7" id="3hZrJU618GO" role="33vP2m">
+              <node concept="37vLTw" id="3hZrJU618jm" role="3K4Cdx">
+                <ref role="3cqZAo" node="53tmmMsyoOs" resolve="isNested" />
+              </node>
+              <node concept="2ShNRf" id="53tmmMs$86s" role="3K4GZi">
+                <node concept="2T8Vx0" id="53tmmMs$9qU" role="2ShVmc">
+                  <node concept="2I9FWS" id="53tmmMs$9qW" role="2T96Bj">
+                    <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="53tmmMszTGm" role="3K4E3e">
+                <node concept="37vLTw" id="53tmmMszS$Z" role="2Oq$k0">
+                  <ref role="3cqZAo" node="53tmmMszArF" resolve="clsContext" />
+                </node>
+                <node concept="3Tsc0h" id="53tmmMszTHA" role="2OqNvi">
+                  <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="4xoHD1G0uIL" role="3cqZAp" />
@@ -4090,6 +4073,35 @@
                 </node>
               </node>
             </node>
+            <node concept="3Aq93q" id="3hZrJU5XXDN" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="3hZrJU5XXDO" role="3Ip0Jz">
+                <node concept="3IrJb3" id="3hZrJU5XXE2" role="3I6sU7">
+                  <node concept="3clFbS" id="3hZrJU5XXE3" role="3IrJb0">
+                    <node concept="3clFbJ" id="3hZrJU5XXM0" role="3cqZAp">
+                      <node concept="37vLTw" id="3hZrJU5XXMc" role="3clFbw">
+                        <ref role="3cqZAo" node="53tmmMsyoOs" resolve="isNested" />
+                      </node>
+                      <node concept="3clFbS" id="3hZrJU5XXM2" role="3clFbx">
+                        <node concept="3Aqczg" id="3hZrJU5Y02y" role="3cqZAp">
+                          <node concept="3Aqt3T" id="3hZrJU5Y02x" role="3Aqpz8">
+                            <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                            <node concept="37jhX" id="3hZrJU618Yv" role="3AunhB">
+                              <node concept="37vLTw" id="3hZrJU618Yt" role="37jj2">
+                                <ref role="3cqZAo" node="53tmmMsz1bS" resolve="operandCtx" />
+                              </node>
+                            </node>
+                            <node concept="a7P8L" id="3hZrJU5Y04o" role="3AunhB">
+                              <ref role="a7OzE" node="3hZrJU5Y02T" resolve="ContextType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3NuqgR" id="4xoHD1GdINr" role="0Rg$4">
               <node concept="aZer4" id="4xoHD1GdINs" role="3XD1gS">
                 <property role="TrG5h" value="ClsScheme" />
@@ -4100,10 +4112,13 @@
               <node concept="32pEOW" id="24ciDNzxNBR" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="53tmmMszZsx" role="0Rg$4">
+              <node concept="aZer4" id="3hZrJU5Y02T" role="3XD1gS">
+                <property role="TrG5h" value="ContextType" />
+              </node>
               <node concept="aZer4" id="53tmmMszZsy" role="3XD1gS">
                 <property role="TrG5h" value="ContextTySubs" />
                 <node concept="2OqwBi" id="53tmmMs$m$u" role="3gj$pD">
-                  <node concept="37vLTw" id="53tmmMs$mad" role="2Oq$k0">
+                  <node concept="37vLTw" id="3hZrJU5Y0ET" role="2Oq$k0">
                     <ref role="3cqZAo" node="53tmmMs$6_O" resolve="contextTvds" />
                   </node>
                   <node concept="34oBXx" id="53tmmMs$o1P" role="2OqNvi" />
@@ -4116,6 +4131,63 @@
                 <node concept="3I6sU6" id="4xoHD1G0uJ3" role="3Ip0Jz">
                   <node concept="3IrJb3" id="4xoHD1G0uJ4" role="3I6sU7">
                     <node concept="3clFbS" id="4xoHD1G0uJ5" role="3IrJb0">
+                      <node concept="3clFbJ" id="3hZrJU5Y07h" role="3cqZAp">
+                        <node concept="3clFbS" id="3hZrJU5Y07j" role="3clFbx">
+                          <node concept="3SKdUt" id="3hZrJU5Y04X" role="3cqZAp">
+                            <node concept="1PaTwC" id="3hZrJU5Y04Y" role="1aUNEU">
+                              <node concept="3oM_SD" id="3hZrJU5Y04Z" role="1PaTwD">
+                                <property role="3oM_SC" value="get" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y050" role="1PaTwD">
+                                <property role="3oM_SC" value="substitutions" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y051" role="1PaTwD">
+                                <property role="3oM_SC" value="for" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y052" role="1PaTwD">
+                                <property role="3oM_SC" value="context" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y053" role="1PaTwD">
+                                <property role="3oM_SC" value="type" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y054" role="1PaTwD">
+                                <property role="3oM_SC" value="variables" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3Aqczg" id="3hZrJU5Y055" role="3cqZAp">
+                            <node concept="3Aqt3T" id="3hZrJU5Y056" role="3Aqpz8">
+                              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                              <node concept="a7P8L" id="3hZrJU5Y0aY" role="3AunhB">
+                                <ref role="a7OzE" node="3hZrJU5Y02T" resolve="ContextType" />
+                              </node>
+                              <node concept="ns1u0" id="3hZrJU5Y058" role="3AunhB">
+                                <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
+                                <node concept="nsMwS" id="3hZrJU5Y059" role="ns1xD">
+                                  <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                                  <node concept="2OqwBi" id="3hZrJU5Y05a" role="nsMwV">
+                                    <node concept="37vLTw" id="3hZrJU5Y0s5" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="53tmmMszArF" resolve="clsContext" />
+                                    </node>
+                                    <node concept="iZEcu" id="3hZrJU5Y05c" role="2OqNvi" />
+                                  </node>
+                                </node>
+                                <node concept="nsMwS" id="3hZrJU5Y05d" role="ns1xD">
+                                  <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
+                                  <node concept="1nq8_$" id="3hZrJU5Y2$_" role="nsMwV">
+                                    <node concept="a7P8L" id="3hZrJU5Y2$$" role="1nq8_t">
+                                      <ref role="a7OzE" node="53tmmMszZsy" resolve="ContextTySubs" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="3hZrJU5Y082" role="3clFbw">
+                          <ref role="3cqZAo" node="53tmmMsyoOs" resolve="isNested" />
+                        </node>
+                      </node>
                       <node concept="3Aqczg" id="53tmmMsxTn8" role="3cqZAp">
                         <node concept="3jm4v3" id="53tmmMsxTn4" role="3Aqpz8">
                           <ref role="3jm46O" node="53tmmMs9igR" resolve="instantiateScheme" />
@@ -4304,6 +4376,19 @@
           </node>
         </node>
         <node concept="3clFbH" id="4xoHD1GirQ9" role="3cqZAp" />
+        <node concept="3SKdUt" id="3hZrJU63u8S" role="3cqZAp">
+          <node concept="1PaTwC" id="3hZrJU63u8T" role="1aUNEU">
+            <node concept="3oM_SD" id="3hZrJU63u8U" role="1PaTwD">
+              <property role="3oM_SC" value="fixme:" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63ucu" role="1PaTwD">
+              <property role="3oM_SC" value="consider" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63ucx" role="1PaTwD">
+              <property role="3oM_SC" value="NestedNewExpression" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="4xoHD1Gjrvv" role="3cqZAp" />
         <node concept="1nLNNL" id="53tmmMsXI$a" role="3cqZAp">
           <node concept="1nLNMm" id="53tmmMsXI$b" role="1nLNNK">
@@ -4410,6 +4495,18 @@
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="3hZrJU61bEh" role="0Rg$4">
+              <node concept="aZer4" id="53tmmMsXI$X" role="3XD1gS">
+                <property role="TrG5h" value="ClsContextTySubs" />
+                <node concept="2OqwBi" id="53tmmMsXI$Y" role="3gj$pD">
+                  <node concept="37vLTw" id="53tmmMt344P" role="2Oq$k0">
+                    <ref role="3cqZAo" node="53tmmMsX7Db" resolve="contextTvds" />
+                  </node>
+                  <node concept="34oBXx" id="53tmmMsXI_0" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="32pEOW" id="3hZrJU61bEP" role="3vLBG7" />
+            </node>
             <node concept="3NuqgR" id="53tmmMsXI$Q" role="0Rg$4">
               <node concept="aZer4" id="53tmmMsXI$R" role="3XD1gS">
                 <property role="TrG5h" value="InstClsType" />
@@ -4426,15 +4523,6 @@
                   <node concept="34oBXx" id="53tmmMsXI$W" role="2OqNvi" />
                 </node>
               </node>
-              <node concept="aZer4" id="53tmmMsXI$X" role="3XD1gS">
-                <property role="TrG5h" value="ClsContextTySubs" />
-                <node concept="2OqwBi" id="53tmmMsXI$Y" role="3gj$pD">
-                  <node concept="37vLTw" id="53tmmMt344P" role="2Oq$k0">
-                    <ref role="3cqZAo" node="53tmmMsX7Db" resolve="contextTvds" />
-                  </node>
-                  <node concept="34oBXx" id="53tmmMsXI_0" role="2OqNvi" />
-                </node>
-              </node>
               <node concept="32pEOW" id="53tmmMsXI_1" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="53tmmMsXI_2" role="0Rg$4">
@@ -4796,21 +4884,6 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="53tmmMsS6bf" role="3cqZAp">
-          <node concept="3cpWsn" id="53tmmMsS6bi" role="3cpWs9">
-            <property role="TrG5h" value="contextTvds" />
-            <node concept="2I9FWS" id="53tmmMsS6bd" role="1tU5fm">
-              <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-            </node>
-            <node concept="2ShNRf" id="53tmmMsS9w1" role="33vP2m">
-              <node concept="2T8Vx0" id="53tmmMsS9FW" role="2ShVmc">
-                <node concept="2I9FWS" id="53tmmMsS9FY" role="2T96Bj">
-                  <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbH" id="4xoHD1GpWcR" role="3cqZAp" />
         <node concept="3cpWs8" id="53tmmMs8U_C" role="3cqZAp">
           <node concept="3cpWsn" id="53tmmMs8U_F" role="3cpWs9">
@@ -4860,6 +4933,116 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="3hZrJU5XUid" role="3cqZAp" />
+        <node concept="3cpWs8" id="3hZrJU5Y3JX" role="3cqZAp">
+          <node concept="3cpWsn" id="3hZrJU5Y3K0" role="3cpWs9">
+            <property role="TrG5h" value="nestedNew" />
+            <node concept="3Tqbb2" id="3hZrJU5Y3JV" role="1tU5fm">
+              <ref role="ehGHo" to="tpee:6kfBYRWHrp$" resolve="NestedNewExpression" />
+            </node>
+            <node concept="2OqwBi" id="3hZrJU5Y2Pi" role="33vP2m">
+              <node concept="3A2sRY" id="3hZrJU5Y2Fe" role="2Oq$k0">
+                <ref role="3A2yKK" node="4xoHD1GpWgY" resolve="cc" />
+              </node>
+              <node concept="2Xjw5R" id="3hZrJU5Y3rl" role="2OqNvi">
+                <node concept="1xMEDy" id="3hZrJU5Y3rn" role="1xVPHs">
+                  <node concept="chp4Y" id="3hZrJU5Y3wB" role="ri$Ld">
+                    <ref role="cht4Q" to="tpee:6kfBYRWHrp$" resolve="NestedNewExpression" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3hZrJU5Y0Xb" role="3cqZAp">
+          <node concept="3cpWsn" id="3hZrJU5Y0Xc" role="3cpWs9">
+            <property role="TrG5h" value="isNested" />
+            <node concept="10P_77" id="3hZrJU5Y0Xd" role="1tU5fm" />
+            <node concept="2OqwBi" id="3hZrJU5Y5qE" role="33vP2m">
+              <node concept="37vLTw" id="3hZrJU5Y5d3" role="2Oq$k0">
+                <ref role="3cqZAo" node="3hZrJU5Y3K0" resolve="nestedNew" />
+              </node>
+              <node concept="3x8VRR" id="3hZrJU5Y60h" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3hZrJU5Y0Xk" role="3cqZAp">
+          <node concept="3cpWsn" id="3hZrJU5Y0Xl" role="3cpWs9">
+            <property role="TrG5h" value="operandCtx" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3Tqbb2" id="3hZrJU5Y0Xm" role="1tU5fm" />
+            <node concept="3K4zz7" id="3hZrJU619p4" role="33vP2m">
+              <node concept="10Nm6u" id="3hZrJU619pN" role="3K4GZi" />
+              <node concept="37vLTw" id="3hZrJU618YM" role="3K4Cdx">
+                <ref role="3cqZAo" node="3hZrJU5Y0Xc" resolve="isNested" />
+              </node>
+              <node concept="2OqwBi" id="3hZrJU5Y0X_" role="3K4E3e">
+                <node concept="2qgKlT" id="3hZrJU5Y0XA" role="2OqNvi">
+                  <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
+                </node>
+                <node concept="37vLTw" id="3hZrJU5Y7aS" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3hZrJU5Y3K0" resolve="nestedNew" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3hZrJU5Y0Xn" role="3cqZAp">
+          <node concept="3cpWsn" id="3hZrJU5Y0Xo" role="3cpWs9">
+            <property role="TrG5h" value="clsContext" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3Tqbb2" id="3hZrJU5Y0Xp" role="1tU5fm">
+              <ref role="ehGHo" to="tpee:g96eOhU" resolve="GenericDeclaration" />
+            </node>
+            <node concept="3K4zz7" id="3hZrJU61ast" role="33vP2m">
+              <node concept="10Nm6u" id="3hZrJU61avG" role="3K4GZi" />
+              <node concept="37vLTw" id="3hZrJU61a3X" role="3K4Cdx">
+                <ref role="3cqZAo" node="3hZrJU5Y0Xc" resolve="isNested" />
+              </node>
+              <node concept="2OqwBi" id="3hZrJU5Y0XJ" role="3K4E3e">
+                <node concept="37vLTw" id="3hZrJU5Y0XK" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4xoHD1GpWcA" resolve="cls" />
+                </node>
+                <node concept="2Xjw5R" id="3hZrJU5Y0XL" role="2OqNvi">
+                  <node concept="1xMEDy" id="3hZrJU5Y0XM" role="1xVPHs">
+                    <node concept="chp4Y" id="3hZrJU5Y0XN" role="ri$Ld">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3hZrJU5Y0Xq" role="3cqZAp">
+          <node concept="3cpWsn" id="3hZrJU5Y0Xr" role="3cpWs9">
+            <property role="TrG5h" value="contextTvds" />
+            <property role="3TUv4t" value="true" />
+            <node concept="2I9FWS" id="3hZrJU5Y0Xs" role="1tU5fm">
+              <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+            </node>
+            <node concept="3K4zz7" id="3hZrJU61aZ2" role="33vP2m">
+              <node concept="37vLTw" id="3hZrJU61a_S" role="3K4Cdx">
+                <ref role="3cqZAo" node="3hZrJU5Y0Xc" resolve="isNested" />
+              </node>
+              <node concept="2ShNRf" id="3hZrJU5Y0Xt" role="3K4GZi">
+                <node concept="2T8Vx0" id="3hZrJU5Y0Xu" role="2ShVmc">
+                  <node concept="2I9FWS" id="3hZrJU5Y0Xv" role="2T96Bj">
+                    <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="3hZrJU5Y0XR" role="3K4E3e">
+                <node concept="37vLTw" id="3hZrJU5Y0XS" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3hZrJU5Y0Xo" resolve="clsContext" />
+                </node>
+                <node concept="3Tsc0h" id="3hZrJU5Y0XT" role="2OqNvi">
+                  <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="4xoHD1GpWdn" role="3cqZAp" />
         <node concept="3SKdUt" id="53tmmMsXP$y" role="3cqZAp">
           <node concept="1PaTwC" id="53tmmMsXP$z" role="1aUNEU">
@@ -4982,10 +5165,45 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbJ" id="3hZrJU5Y2jT" role="3cqZAp">
+                      <node concept="37vLTw" id="3hZrJU5Y2jU" role="3clFbw">
+                        <ref role="3cqZAo" node="3hZrJU5Y0Xc" resolve="isNested" />
+                      </node>
+                      <node concept="3clFbS" id="3hZrJU5Y2jV" role="3clFbx">
+                        <node concept="3Aqczg" id="3hZrJU5Y2jW" role="3cqZAp">
+                          <node concept="3Aqt3T" id="3hZrJU5Y2jX" role="3Aqpz8">
+                            <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                            <node concept="37jhX" id="3hZrJU5Y2jY" role="3AunhB">
+                              <node concept="37vLTw" id="3hZrJU5Y2jZ" role="37jj2">
+                                <ref role="3cqZAo" node="3hZrJU5Y0Xl" resolve="operandCtx" />
+                              </node>
+                            </node>
+                            <node concept="a7P8L" id="3hZrJU5Y2k0" role="3AunhB">
+                              <ref role="a7OzE" node="3hZrJU5Y2iA" resolve="ContextType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3NuqgR" id="3hZrJU5Y2i_" role="0Rg$4">
+              <node concept="aZer4" id="3hZrJU5Y2iA" role="3XD1gS">
+                <property role="TrG5h" value="ContextType" />
+              </node>
+              <node concept="aZer4" id="53tmmMsS1kv" role="3XD1gS">
+                <property role="TrG5h" value="ClsContextTySubs" />
+                <node concept="2OqwBi" id="53tmmMsSc$L" role="3gj$pD">
+                  <node concept="37vLTw" id="3hZrJU5Y2hf" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3hZrJU5Y0Xr" resolve="contextTvds" />
+                  </node>
+                  <node concept="34oBXx" id="53tmmMsSfJW" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="32pEOW" id="3hZrJU5Y2j9" role="3vLBG7" />
+            </node>
             <node concept="3NuqgR" id="4xoHD1GpWdB" role="0Rg$4">
               <node concept="aZer4" id="53tmmMsRNVB" role="3XD1gS">
                 <property role="TrG5h" value="InstClsType" />
@@ -5002,15 +5220,6 @@
                   <node concept="34oBXx" id="4xoHD1GpWdG" role="2OqNvi" />
                 </node>
               </node>
-              <node concept="aZer4" id="53tmmMsS1kv" role="3XD1gS">
-                <property role="TrG5h" value="ClsContextTySubs" />
-                <node concept="2OqwBi" id="53tmmMsSc$L" role="3gj$pD">
-                  <node concept="37vLTw" id="53tmmMt343A" role="2Oq$k0">
-                    <ref role="3cqZAo" node="53tmmMsS6bi" resolve="contextTvds" />
-                  </node>
-                  <node concept="34oBXx" id="53tmmMsSfJW" role="2OqNvi" />
-                </node>
-              </node>
               <node concept="32pEOW" id="24ciDNzxNBW" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="53tmmMsQVnb" role="0Rg$4">
@@ -5042,6 +5251,63 @@
                 <node concept="3I6sU6" id="4xoHD1GpWez" role="3Ip0Jz">
                   <node concept="3IrJb3" id="4xoHD1GpWe$" role="3I6sU7">
                     <node concept="3clFbS" id="4xoHD1GpWe_" role="3IrJb0">
+                      <node concept="3clFbJ" id="3hZrJU5Y2qT" role="3cqZAp">
+                        <node concept="3clFbS" id="3hZrJU5Y2qU" role="3clFbx">
+                          <node concept="3SKdUt" id="3hZrJU5Y2qV" role="3cqZAp">
+                            <node concept="1PaTwC" id="3hZrJU5Y2qW" role="1aUNEU">
+                              <node concept="3oM_SD" id="3hZrJU5Y2qX" role="1PaTwD">
+                                <property role="3oM_SC" value="get" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y2qY" role="1PaTwD">
+                                <property role="3oM_SC" value="substitutions" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y2qZ" role="1PaTwD">
+                                <property role="3oM_SC" value="for" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y2r0" role="1PaTwD">
+                                <property role="3oM_SC" value="context" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y2r1" role="1PaTwD">
+                                <property role="3oM_SC" value="type" />
+                              </node>
+                              <node concept="3oM_SD" id="3hZrJU5Y2r2" role="1PaTwD">
+                                <property role="3oM_SC" value="variables" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3Aqczg" id="3hZrJU5Y2r3" role="3cqZAp">
+                            <node concept="3Aqt3T" id="3hZrJU5Y2r4" role="3Aqpz8">
+                              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                              <node concept="a7P8L" id="3hZrJU5Y2r5" role="3AunhB">
+                                <ref role="a7OzE" node="3hZrJU5Y2iA" resolve="ContextType" />
+                              </node>
+                              <node concept="ns1u0" id="3hZrJU5Y2r6" role="3AunhB">
+                                <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
+                                <node concept="nsMwS" id="3hZrJU5Y2r7" role="ns1xD">
+                                  <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                                  <node concept="2OqwBi" id="3hZrJU5Y2r8" role="nsMwV">
+                                    <node concept="37vLTw" id="3hZrJU5Y2r9" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="3hZrJU5Y0Xo" resolve="clsContext" />
+                                    </node>
+                                    <node concept="iZEcu" id="3hZrJU5Y2ra" role="2OqNvi" />
+                                  </node>
+                                </node>
+                                <node concept="nsMwS" id="3hZrJU5Y2rb" role="ns1xD">
+                                  <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
+                                  <node concept="1nq8_$" id="3hZrJU5Y2yA" role="nsMwV">
+                                    <node concept="a7P8L" id="3hZrJU5Y2y_" role="1nq8_t">
+                                      <ref role="a7OzE" node="53tmmMsS1kv" resolve="ClsContextTySubs" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="3hZrJU5Y2rg" role="3clFbw">
+                          <ref role="3cqZAo" node="3hZrJU5Y0Xc" resolve="isNested" />
+                        </node>
+                      </node>
                       <node concept="3SKdUt" id="53tmmMsUD_x" role="3cqZAp">
                         <node concept="1PaTwC" id="53tmmMsUD_y" role="1aUNEU">
                           <node concept="3oM_SD" id="53tmmMsUFYB" role="1PaTwD">
@@ -5070,8 +5336,8 @@
                           <node concept="37vLTw" id="53tmmMsSkZc" role="3jicU7">
                             <ref role="3cqZAo" node="4xoHD1GpWcM" resolve="clsTyArgs" />
                           </node>
-                          <node concept="37vLTw" id="53tmmMsTdZv" role="3jicU7">
-                            <ref role="3cqZAo" node="53tmmMsS6bi" resolve="contextTvds" />
+                          <node concept="37vLTw" id="3hZrJU5Y2iu" role="3jicU7">
+                            <ref role="3cqZAo" node="3hZrJU5Y0Xr" resolve="contextTvds" />
                           </node>
                           <node concept="a7P8L" id="53tmmMsRSeM" role="3jm6SO">
                             <ref role="a7OzE" node="53tmmMsRNVB" resolve="InstClsType" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
index 284e4dfb..adfa9cc9 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
@@ -6630,6 +6630,39 @@
       <node concept="312cEu" id="2i6cuYR5LG5" role="jymVt">
         <property role="2bfB8j" value="true" />
         <property role="TrG5h" value="G2" />
+        <node concept="3clFbW" id="3hZrJU5XRvq" role="jymVt">
+          <node concept="37vLTG" id="3hZrJU5XRyY" role="3clF46">
+            <property role="TrG5h" value="t2" />
+            <node concept="16syzq" id="3hZrJU5XR$u" role="1tU5fm">
+              <ref role="16sUi3" node="2i6cuYR5LKL" resolve="T2" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="3hZrJU5XRvr" role="3clF45" />
+          <node concept="3clFbS" id="3hZrJU5XRvt" role="3clF47">
+            <node concept="3clFbF" id="3hZrJU5XRKk" role="3cqZAp">
+              <node concept="37vLTI" id="3hZrJU5XRX0" role="3clFbG">
+                <node concept="37vLTw" id="3hZrJU5XRZA" role="37vLTx">
+                  <ref role="3cqZAo" node="3hZrJU5XRyY" resolve="t2" />
+                </node>
+                <node concept="2OqwBi" id="3hZrJU5XRO$" role="37vLTJ">
+                  <node concept="Xjq3P" id="3hZrJU5XRKj" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="3hZrJU5XRSh" role="2OqNvi">
+                    <ref role="2Oxat5" node="3hZrJU5XRHM" resolve="t" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3Tm1VV" id="3hZrJU5XRtx" role="1B3o_S" />
+        </node>
+        <node concept="312cEg" id="3hZrJU5XRHM" role="jymVt">
+          <property role="TrG5h" value="t" />
+          <node concept="3Tm6S6" id="3hZrJU5XRFm" role="1B3o_S" />
+          <node concept="16syzq" id="3hZrJU5XRHg" role="1tU5fm">
+            <ref role="16sUi3" node="2i6cuYR5LKL" resolve="T2" />
+          </node>
+        </node>
+        <node concept="2tJIrI" id="3hZrJU5XS1Z" role="jymVt" />
         <node concept="3clFb_" id="2i6cuYR5M9t" role="jymVt">
           <property role="TrG5h" value="foo" />
           <node concept="37vLTG" id="2i6cuYR5My$" role="3clF46">
@@ -6673,6 +6706,9 @@
         <node concept="3Tm1VV" id="2i6cuYR5LFF" role="1B3o_S" />
         <node concept="16euLQ" id="2i6cuYR5LKL" role="16eVyc">
           <property role="TrG5h" value="T2" />
+          <node concept="16syzq" id="3hZrJU5XS9k" role="3ztrMU">
+            <ref role="16sUi3" node="2i6cuYR5Lvs" resolve="T1" />
+          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="2i6cuYR5Lj8" role="1B3o_S" />
@@ -6683,6 +6719,18 @@
     <node concept="2tJIrI" id="2i6cuYR5OdF" role="jymVt" />
     <node concept="3clFb_" id="2i6cuYR5Ouw" role="jymVt">
       <property role="TrG5h" value="demo" />
+      <node concept="37vLTG" id="3hZrJU63Hu3" role="3clF46">
+        <property role="TrG5h" value="a1" />
+        <node concept="3uibUv" id="3hZrJU63Hy6" role="1tU5fm">
+          <ref role="3uigEE" node="2i6cuYR5S$V" resolve="NestedGenerics.A" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3hZrJU5XShB" role="3clF46">
+        <property role="TrG5h" value="b1" />
+        <node concept="3uibUv" id="3hZrJU5XSkf" role="1tU5fm">
+          <ref role="3uigEE" node="2i6cuYR5S_3" resolve="NestedGenerics.B" />
+        </node>
+      </node>
       <node concept="37vLTG" id="2i6cuYR62y5" role="3clF46">
         <property role="TrG5h" value="c1" />
         <node concept="3uibUv" id="2i6cuYR62DU" role="1tU5fm">
@@ -6696,42 +6744,65 @@
             <property role="TrG5h" value="g1" />
             <node concept="3uibUv" id="2i6cuYR5P9W" role="1tU5fm">
               <ref role="3uigEE" node="2i6cuYR5Lna" resolve="NestedGenerics.G1" />
-              <node concept="3uibUv" id="2i6cuYR5T1C" role="11_B2D">
-                <ref role="3uigEE" node="2i6cuYR5S$V" resolve="NestedGenerics.A" />
+              <node concept="3uibUv" id="3hZrJU63H9f" role="11_B2D">
+                <ref role="3uigEE" node="2i6cuYR5S_3" resolve="NestedGenerics.B" />
               </node>
             </node>
             <node concept="2ShNRf" id="2i6cuYR5Tbg" role="33vP2m">
               <node concept="HV5vD" id="2i6cuYR5THM" role="2ShVmc">
                 <ref role="HV5vE" node="2i6cuYR5Lna" resolve="NestedGenerics.G1" />
-                <node concept="3uibUv" id="2i6cuYR5TQk" role="HU9BZ">
-                  <ref role="3uigEE" node="2i6cuYR5S$V" resolve="NestedGenerics.A" />
+                <node concept="3uibUv" id="3hZrJU63HfA" role="HU9BZ">
+                  <ref role="3uigEE" node="2i6cuYR5S_3" resolve="NestedGenerics.B" />
                 </node>
               </node>
             </node>
           </node>
         </node>
         <node concept="3clFbH" id="6_5E9TNzeXm" role="3cqZAp" />
-        <node concept="1X3_iC" id="6_5E9TNzhlw" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3cpWs8" id="2i6cuYR5TZe" role="8Wnug">
-            <node concept="3cpWsn" id="2i6cuYR5TZf" role="3cpWs9">
-              <property role="TrG5h" value="g2" />
-              <node concept="3uibUv" id="2i6cuYR5TZg" role="1tU5fm">
-                <ref role="3uigEE" node="2i6cuYR5LG5" resolve="NestedGenerics.G1.G2" />
-                <node concept="3uibUv" id="2i6cuYR5UUP" role="11_B2D">
-                  <ref role="3uigEE" node="2i6cuYR5S_3" resolve="NestedGenerics.B" />
+        <node concept="3cpWs8" id="2i6cuYR5TZe" role="3cqZAp">
+          <node concept="3cpWsn" id="2i6cuYR5TZf" role="3cpWs9">
+            <property role="TrG5h" value="g2ok" />
+            <node concept="3uibUv" id="2i6cuYR5TZg" role="1tU5fm">
+              <ref role="3uigEE" node="2i6cuYR5LG5" resolve="NestedGenerics.G1.G2" />
+              <node concept="3uibUv" id="3hZrJU63GCD" role="11_B2D">
+                <ref role="3uigEE" node="2i6cuYR5S_3" resolve="NestedGenerics.B" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2i6cuYR5YbQ" role="33vP2m">
+              <node concept="37vLTw" id="2i6cuYR5Y9g" role="2Oq$k0">
+                <ref role="3cqZAo" node="2i6cuYR5P9Z" resolve="g1" />
+              </node>
+              <node concept="2pIyA9" id="2i6cuYR5YfC" role="2OqNvi">
+                <node concept="1pGfFk" id="3hZrJU63GNm" role="2ShVmc">
+                  <ref role="37wK5l" node="3hZrJU5XRvq" resolve="NestedGenerics.G1.G2" />
+                  <node concept="37vLTw" id="3hZrJU63GRM" role="37wK5m">
+                    <ref role="3cqZAo" node="3hZrJU5XShB" resolve="b1" />
+                  </node>
                 </node>
               </node>
-              <node concept="2OqwBi" id="2i6cuYR5YbQ" role="33vP2m">
-                <node concept="37vLTw" id="2i6cuYR5Y9g" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2i6cuYR5P9Z" resolve="g1" />
-                </node>
-                <node concept="2pIyA9" id="2i6cuYR5YfC" role="2OqNvi">
-                  <node concept="HV5vD" id="2i6cuYR5Yk_" role="2ShVmc">
-                    <ref role="HV5vE" node="2i6cuYR5LG5" resolve="NestedGenerics.G1.G2" />
-                    <node concept="3uibUv" id="2i6cuYR5YAe" role="HU9BZ">
-                      <ref role="3uigEE" node="2Cji6ER2Zv0" resolve="Containment.B" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3hZrJU63Hk6" role="3cqZAp">
+          <node concept="3cpWsn" id="3hZrJU63Hk7" role="3cpWs9">
+            <property role="TrG5h" value="g2bad1" />
+            <node concept="3uibUv" id="3hZrJU63Hk8" role="1tU5fm">
+              <ref role="3uigEE" node="2i6cuYR5LG5" resolve="NestedGenerics.G1.G2" />
+              <node concept="3uibUv" id="3hZrJU63HXd" role="11_B2D">
+                <ref role="3uigEE" node="2i6cuYR5S$V" resolve="NestedGenerics.A" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3hZrJU63Hka" role="33vP2m">
+              <node concept="37vLTw" id="3hZrJU63Hkb" role="2Oq$k0">
+                <ref role="3cqZAo" node="2i6cuYR5P9Z" resolve="g1" />
+              </node>
+              <node concept="2pIyA9" id="3hZrJU63Hkc" role="2OqNvi">
+                <node concept="1pGfFk" id="3hZrJU63Hkd" role="2ShVmc">
+                  <ref role="37wK5l" node="3hZrJU5XRvq" resolve="NestedGenerics.G1.G2" />
+                  <node concept="37vLTw" id="3hZrJU63Hzf" role="37wK5m">
+                    <ref role="3cqZAo" node="3hZrJU63Hu3" resolve="a1" />
+                    <node concept="1U20sH" id="3hZrJU63ImJ" role="lGtFl">
+                      <property role="1U20sK" value="error" />
                     </node>
                   </node>
                 </node>
@@ -6739,6 +6810,7 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="3hZrJU63HNe" role="3cqZAp" />
         <node concept="1X3_iC" id="6_5E9TNzfjP" role="lGtFl">
           <property role="3V$3am" value="statement" />
           <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
@@ -6750,7 +6822,7 @@
               </node>
               <node concept="2OqwBi" id="2i6cuYR61IO" role="33vP2m">
                 <node concept="37vLTw" id="2i6cuYR61Gk" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2i6cuYR5TZf" resolve="g2" />
+                  <ref role="3cqZAo" node="2i6cuYR5TZf" resolve="g2ok" />
                 </node>
                 <node concept="liA8E" id="2i6cuYR61Q6" role="2OqNvi">
                   <ref role="37wK5l" node="2i6cuYR5M9t" resolve="foo" />
@@ -6764,6 +6836,58 @@
           </node>
         </node>
         <node concept="3clFbH" id="6_5E9TNzf85" role="3cqZAp" />
+        <node concept="3SKdUt" id="3hZrJU63mOe" role="3cqZAp">
+          <node concept="1PaTwC" id="3hZrJU63mOf" role="1aUNEU">
+            <node concept="3oM_SD" id="3hZrJU63mRx" role="1PaTwD">
+              <property role="3oM_SC" value="fixme:" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mRF" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mRI" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mSd" role="1PaTwD">
+              <property role="3oM_SC" value="two-level" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mSy" role="1PaTwD">
+              <property role="3oM_SC" value="deep" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mT0" role="1PaTwD">
+              <property role="3oM_SC" value="generic" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mTf" role="1PaTwD">
+              <property role="3oM_SC" value="context" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mTB" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mTK" role="1PaTwD">
+              <property role="3oM_SC" value="method" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mTU" role="1PaTwD">
+              <property role="3oM_SC" value="call," />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mVx" role="1PaTwD">
+              <property role="3oM_SC" value="it" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mVP" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63mW2" role="1PaTwD">
+              <property role="3oM_SC" value="valid" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63FKa" role="1PaTwD">
+              <property role="3oM_SC" value="but" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63FKp" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="3hZrJU63FKD" role="1PaTwD">
+              <property role="3oM_SC" value="handled" />
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="6_5E9TNzgvC" role="3cqZAp">
           <node concept="3cpWsn" id="6_5E9TNzgvD" role="3cpWs9">
             <property role="TrG5h" value="c2" />
@@ -6777,10 +6901,10 @@
                     <ref role="3cqZAo" node="2i6cuYR5P9Z" resolve="g1" />
                   </node>
                   <node concept="2pIyA9" id="6_5E9TNzgvM" role="2OqNvi">
-                    <node concept="HV5vD" id="6_5E9TNzgvN" role="2ShVmc">
-                      <ref role="HV5vE" node="2i6cuYR5LG5" resolve="NestedGenerics.G1.G2" />
-                      <node concept="3uibUv" id="6_5E9TNzgvO" role="HU9BZ">
-                        <ref role="3uigEE" node="2Cji6ER2Zv0" resolve="Containment.B" />
+                    <node concept="1pGfFk" id="3hZrJU5XSf8" role="2ShVmc">
+                      <ref role="37wK5l" node="3hZrJU5XRvq" resolve="NestedGenerics.G1.G2" />
+                      <node concept="37vLTw" id="3hZrJU5XSlu" role="37wK5m">
+                        <ref role="3cqZAo" node="3hZrJU5XShB" resolve="b1" />
                       </node>
                     </node>
                   </node>
@@ -6791,6 +6915,9 @@
                 <node concept="10Nm6u" id="6_5E9TNzh62" role="37wK5m" />
                 <node concept="37vLTw" id="6_5E9TNzhh2" role="37wK5m">
                   <ref role="3cqZAo" node="2i6cuYR62y5" resolve="c1" />
+                  <node concept="1U20sH" id="3hZrJU63GSY" role="lGtFl">
+                    <property role="1U20sK" value="error" />
+                  </node>
                 </node>
               </node>
             </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
index 5b14383d..18c04411 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
@@ -136,19 +136,9 @@
       </concept>
     </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">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
@@ -296,46 +286,26 @@
       <property role="TrG5h" value="NestedGenerics" />
       <node concept="3cqZAl" id="2i6cuYR69K4" role="3clF45" />
       <node concept="3clFbS" id="2i6cuYR69K5" role="3clF47">
-        <node concept="3SKdUt" id="2i6cuYR65wY" role="3cqZAp">
-          <node concept="1PaTwC" id="2i6cuYR65wZ" role="1aUNEU">
-            <node concept="3oM_SD" id="2i6cuYR65x1" role="1PaTwD">
-              <property role="3oM_SC" value="todo:" />
-            </node>
-            <node concept="3oM_SD" id="2i6cuYR65yP" role="1PaTwD">
-              <property role="3oM_SC" value="typecheck" />
-            </node>
-            <node concept="3oM_SD" id="2i6cuYR66qu" role="1PaTwD">
-              <property role="3oM_SC" value="nested" />
-            </node>
-            <node concept="3oM_SD" id="2i6cuYR66vl" role="1PaTwD">
-              <property role="3oM_SC" value="generics" />
-            </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="2i6cuYR6bPF" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="2Hmddi" id="2i6cuYR69K6" role="8Wnug">
-            <node concept="2OqwBi" id="2i6cuYR69K7" role="2Hmdds">
-              <node concept="2YIFZM" id="2i6cuYR69K8" role="2Oq$k0">
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="2i6cuYR69K9" role="37wK5m">
-                  <node concept="2WthIp" id="2i6cuYR69Ka" role="2Oq$k0" />
-                  <node concept="2XshWL" id="2i6cuYR69Kb" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="2i6cuYR69Kc" role="2XxRq1">
-                      <node concept="ZC_QK" id="2i6cuYR6ai2" role="2tJFKM">
-                        <ref role="2aWVGs" to="wqtl:2i6cuYR5KJp" resolve="NestedGenerics" />
-                      </node>
+        <node concept="2Hmddi" id="2i6cuYR69K6" role="3cqZAp">
+          <node concept="2OqwBi" id="2i6cuYR69K7" role="2Hmdds">
+            <node concept="2YIFZM" id="2i6cuYR69K8" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <node concept="2OqwBi" id="2i6cuYR69K9" role="37wK5m">
+                <node concept="2WthIp" id="2i6cuYR69Ka" role="2Oq$k0" />
+                <node concept="2XshWL" id="2i6cuYR69Kb" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="2i6cuYR69Kc" role="2XxRq1">
+                    <node concept="ZC_QK" id="2i6cuYR6ai2" role="2tJFKM">
+                      <ref role="2aWVGs" to="wqtl:2i6cuYR5KJp" resolve="NestedGenerics" />
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="2i6cuYR69Ke" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="2i6cuYR69Kf" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
               </node>
+              <node concept="1jxXqW" id="2i6cuYR69Ke" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="2i6cuYR69Kf" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
         </node>