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 8f5e46d9..6312966c 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
@@ -19,6 +19,7 @@
       </concept>
       <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="7282214966977214052" name="jetbrains.mps.baseLanguage.structure.NestedNewExpression" flags="ng" index="2pIyA9" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
@@ -6369,5 +6370,167 @@
     </node>
     <node concept="3Tm1VV" id="3fECE2uQCW7" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="2i6cuYR5KJp">
+    <property role="TrG5h" value="NestedGenerics" />
+    <node concept="2tJIrI" id="2i6cuYR5ST5" role="jymVt" />
+    <node concept="312cEu" id="2i6cuYR5S$V" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="A" />
+      <node concept="3Tm6S6" id="2i6cuYR5S_2" role="1B3o_S" />
+    </node>
+    <node concept="312cEu" id="2i6cuYR5S_3" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="B" />
+      <node concept="3Tm6S6" id="2i6cuYR5S_a" role="1B3o_S" />
+      <node concept="3uibUv" id="2i6cuYR5S_b" role="1zkMxy">
+        <ref role="3uigEE" node="2i6cuYR5S$V" resolve="NestedGenerics.A" />
+      </node>
+    </node>
+    <node concept="312cEu" id="2i6cuYR5Uz5" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="C" />
+      <node concept="3Tm6S6" id="2i6cuYR5Uz6" role="1B3o_S" />
+      <node concept="3uibUv" id="2i6cuYR5UPX" role="1zkMxy">
+        <ref role="3uigEE" node="2i6cuYR5S_3" resolve="NestedGenerics.B" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2i6cuYR5S$r" role="jymVt" />
+    <node concept="312cEu" id="2i6cuYR5Lna" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="G1" />
+      <node concept="312cEu" id="2i6cuYR5LG5" role="jymVt">
+        <property role="2bfB8j" value="true" />
+        <property role="TrG5h" value="G2" />
+        <node concept="3clFb_" id="2i6cuYR5M9t" role="jymVt">
+          <property role="TrG5h" value="foo" />
+          <node concept="37vLTG" id="2i6cuYR5My$" role="3clF46">
+            <property role="TrG5h" value="t1" />
+            <node concept="16syzq" id="2i6cuYR5MTV" role="1tU5fm">
+              <ref role="16sUi3" node="2i6cuYR5Lvs" resolve="T1" />
+            </node>
+          </node>
+          <node concept="37vLTG" id="2i6cuYR5MYe" role="3clF46">
+            <property role="TrG5h" value="t3" />
+            <node concept="16syzq" id="2i6cuYR5MYV" role="1tU5fm">
+              <ref role="16sUi3" node="2i6cuYR5MdU" resolve="T3" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="2i6cuYR5M9w" role="3clF47">
+            <node concept="3clFbF" id="2i6cuYR5NwZ" role="3cqZAp">
+              <node concept="37vLTI" id="2i6cuYR5Nzt" role="3clFbG">
+                <node concept="37vLTw" id="2i6cuYR5NCt" role="37vLTx">
+                  <ref role="3cqZAo" node="2i6cuYR5MYe" resolve="t3" />
+                </node>
+                <node concept="37vLTw" id="2i6cuYR5NwY" role="37vLTJ">
+                  <ref role="3cqZAo" node="2i6cuYR5My$" resolve="t1" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="2i6cuYR5Zrl" role="3cqZAp">
+              <node concept="10Nm6u" id="2i6cuYR5ZFz" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3Tm1VV" id="2i6cuYR5LXq" role="1B3o_S" />
+          <node concept="16syzq" id="2i6cuYR5Zbx" role="3clF45">
+            <ref role="16sUi3" node="2i6cuYR5MdU" resolve="T3" />
+          </node>
+          <node concept="16euLQ" id="2i6cuYR5MdU" role="16eVyc">
+            <property role="TrG5h" value="T3" />
+            <node concept="16syzq" id="2i6cuYR5Noi" role="3ztrMU">
+              <ref role="16sUi3" node="2i6cuYR5Lvs" resolve="T1" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="2i6cuYR5LFF" role="1B3o_S" />
+        <node concept="16euLQ" id="2i6cuYR5LKL" role="16eVyc">
+          <property role="TrG5h" value="T2" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2i6cuYR5Lj8" role="1B3o_S" />
+      <node concept="16euLQ" id="2i6cuYR5Lvs" role="16eVyc">
+        <property role="TrG5h" value="T1" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2i6cuYR5OdF" role="jymVt" />
+    <node concept="3clFb_" id="2i6cuYR5Ouw" role="jymVt">
+      <property role="TrG5h" value="demo" />
+      <node concept="37vLTG" id="2i6cuYR62y5" role="3clF46">
+        <property role="TrG5h" value="c1" />
+        <node concept="3uibUv" id="2i6cuYR62DU" role="1tU5fm">
+          <ref role="3uigEE" node="2i6cuYR5Uz5" resolve="NestedGenerics.C" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="2i6cuYR5Ouz" role="3clF47">
+        <node concept="3clFbH" id="2i6cuYR67We" role="3cqZAp" />
+        <node concept="3cpWs8" id="2i6cuYR5P9Y" role="3cqZAp">
+          <node concept="3cpWsn" id="2i6cuYR5P9Z" role="3cpWs9">
+            <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>
+            </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>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2i6cuYR5TZe" role="3cqZAp">
+          <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>
+            </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>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2i6cuYR5YVo" role="3cqZAp" />
+        <node concept="3cpWs8" id="2i6cuYR61u7" role="3cqZAp">
+          <node concept="3cpWsn" id="2i6cuYR61u8" role="3cpWs9">
+            <property role="TrG5h" value="c2" />
+            <node concept="3uibUv" id="2i6cuYR61u9" role="1tU5fm">
+              <ref role="3uigEE" node="2i6cuYR5Uz5" resolve="NestedGenerics.C" />
+            </node>
+            <node concept="2OqwBi" id="2i6cuYR61IO" role="33vP2m">
+              <node concept="37vLTw" id="2i6cuYR61Gk" role="2Oq$k0">
+                <ref role="3cqZAo" node="2i6cuYR5TZf" resolve="g2" />
+              </node>
+              <node concept="liA8E" id="2i6cuYR61Q6" role="2OqNvi">
+                <ref role="37wK5l" node="2i6cuYR5M9t" resolve="foo" />
+                <node concept="10Nm6u" id="2i6cuYR6280" role="37wK5m" />
+                <node concept="37vLTw" id="2i6cuYR62UG" role="37wK5m">
+                  <ref role="3cqZAo" node="2i6cuYR62y5" resolve="c1" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2i6cuYR5Oma" role="1B3o_S" />
+      <node concept="3cqZAl" id="2i6cuYR5OmJ" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="2i6cuYR5KJq" role="1B3o_S" />
+  </node>
 </model>
 
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 8b9c39e5..24cdb492 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,9 +136,19 @@
       </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">
@@ -282,6 +292,58 @@
         <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
       </node>
     </node>
+    <node concept="1LZb2c" id="2i6cuYR69K3" role="1SL9yI">
+      <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="3ndbpf">
+            <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>
+                  </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>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="2i6cuYR69Kg" role="Sfmx6">
+        <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+      </node>
+    </node>
     <node concept="1LZb2c" id="1TH_SRmAKUM" role="1SL9yI">
       <property role="TrG5h" value="ComplexTypeErasure" />
       <node concept="3cqZAl" id="1TH_SRmAKUN" role="3clF45" />