From 588c640f9f4aa46fae4aface9da80ad31cb0c110 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Fri, 17 Apr 2026 13:10:37 +0200
Subject: [PATCH 1/9] fix bug & add tests (#739)

---
 ...3.variability.featuremodel.base.editor.mps |  6 +-
 ...ability.featuremodel.base.editor@tests.mps | 85 +++++++++++++++++++
 2 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
index fb6b9e4859..9361c7c200 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
@@ -5499,9 +5499,9 @@
               </node>
               <node concept="2qgKlT" id="3Kl2xAACBO4" role="2OqNvi">
                 <ref role="37wK5l" to="zccc:1GMgmu$sb6j" resolve="addSubFeature" />
-                <node concept="2pJPEk" id="3Kl2xAACBO5" role="37wK5m">
-                  <node concept="2pJPED" id="3Kl2xAACBO6" role="2pJPEn">
-                    <ref role="2pJxaS" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
+                <node concept="2pJPEk" id="1Foaw9JOanl" role="37wK5m">
+                  <node concept="2pJPED" id="1Foaw9JOanm" role="2pJPEn">
+                    <ref role="2pJxaS" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
index c9603b501b..86eb5ee9d2 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
@@ -18,6 +18,9 @@
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="1228934484974" name="jetbrains.mps.lang.test.structure.PressKeyStatement" flags="nn" index="yd1bK">
+        <child id="1228934507814" name="keyStrokes" index="yd6KS" />
+      </concept>
       <concept id="7011073693661765739" name="jetbrains.mps.lang.test.structure.InvokeActionStatement" flags="nn" index="2HxZob">
         <child id="1101347953350127927" name="actionReference" index="3iKnsn" />
       </concept>
@@ -56,6 +59,12 @@
         <child id="8933192351751916178" name="parameter" index="1v$tAf" />
       </concept>
     </language>
+    <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
+      <concept id="1207318242772" name="jetbrains.mps.lang.plugin.structure.KeyMapKeystroke" flags="ng" index="pLAjd">
+        <property id="1207318242773" name="modifiers" index="pLAjc" />
+        <property id="1207318242774" name="keycode" index="pLAjf" />
+      </concept>
+    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -1552,5 +1561,81 @@
       </node>
     </node>
   </node>
+  <node concept="LiM7Y" id="1Foaw9K5pxN">
+    <property role="TrG5h" value="NewChildIsFeature" />
+    <node concept="1qefOq" id="1Foaw9K5pxO" role="25YQCW">
+      <node concept="12iwZl" id="1Foaw9K5pxQ" role="1qenE9">
+        <property role="bVyBI" value="-1971802247" />
+        <node concept="12iwV3" id="1Foaw9K5pxR" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="LIFWc" id="1Foaw9K5pxY" role="lGtFl">
+            <property role="LIFWa" value="0" />
+            <property role="OXtK3" value="true" />
+            <property role="p6zMq" value="0" />
+            <property role="p6zMs" value="0" />
+            <property role="LIFWd" value="property_name" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="1Foaw9K5pxT" role="25YQFr">
+      <node concept="12iwZl" id="1Foaw9K5pxV" role="1qenE9">
+        <property role="bVyBI" value="1836408938" />
+        <node concept="12iwV3" id="1Foaw9K5pxW" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iwV3" id="1Foaw9K5pxX" role="12iwVe" />
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="1Foaw9K5qM4" role="LjaKd">
+      <node concept="yd1bK" id="1Foaw9K5qM2" role="3cqZAp">
+        <node concept="pLAjd" id="1Foaw9K5qM3" role="yd6KS">
+          <property role="pLAjc" value="ctrl" />
+          <property role="pLAjf" value="VK_ENTER" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="LiM7Y" id="1Foaw9Kmv$D">
+    <property role="TrG5h" value="NewSiblingIsFeature" />
+    <node concept="1qefOq" id="1Foaw9Kmv$E" role="25YQCW">
+      <node concept="12iwZl" id="1Foaw9Kmv$G" role="1qenE9">
+        <property role="bVyBI" value="-400666486" />
+        <node concept="12iwV3" id="1Foaw9Kmv$H" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iwV3" id="1Foaw9Kmv$N" role="12iwVe">
+            <property role="TrG5h" value="A" />
+            <node concept="LIFWc" id="1Foaw9Ko8Ur" role="lGtFl">
+              <property role="ZRATv" value="true" />
+              <property role="OXtK3" value="true" />
+              <property role="p6zMq" value="1" />
+              <property role="p6zMs" value="1" />
+              <property role="LIFWd" value="property_name" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="1Foaw9Kmv$J" role="25YQFr">
+      <node concept="12iwZl" id="1Foaw9Kmv$L" role="1qenE9">
+        <property role="bVyBI" value="112496978" />
+        <node concept="12iwV3" id="1Foaw9Kmv$M" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iwV3" id="1Foaw9Kmv$O" role="12iwVe">
+            <property role="TrG5h" value="A" />
+          </node>
+          <node concept="12iwV3" id="1Foaw9Kmv$P" role="12iwVe" />
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="1Foaw9KmvEL" role="LjaKd">
+      <node concept="yd1bK" id="1Foaw9KmvEJ" role="3cqZAp">
+        <node concept="pLAjd" id="1Foaw9KoIiX" role="yd6KS">
+          <property role="pLAjf" value="VK_ENTER" />
+          <property role="pLAjc" value="ctrl+shift" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 

From 140ccdb756eb31c1c03a83986b8057e67ae62737 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Fri, 12 Jun 2026 11:56:29 +0200
Subject: [PATCH 2/9] Fix: Type ':' at Feature to get FeatureModelInclude
 (#739)

---
 ...3.variability.featuremodel.base.editor.mps | 34 ++++----
 ...ability.featuremodel.base.editor@tests.mps | 78 +++++++++++++++++++
 2 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
index 9361c7c200..87acf560b3 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
@@ -7056,29 +7056,9 @@
             </node>
           </node>
         </node>
-        <node concept="3F0ifn" id="1U34Sql9K_K" role="3EZMnx">
-          <node concept="VPM3Z" id="1U34SqlceH8" role="3F10Kt" />
-          <node concept="11LMrY" id="1U34SqlceHd" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
         <node concept="3F0A7n" id="1lex4TVpCxn" role="3EZMnx">
           <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         </node>
-        <node concept="_tjkj" id="1lex4TVpCxo" role="3EZMnx">
-          <node concept="3F1sOY" id="1lex4TVpCxp" role="_tjki">
-            <ref role="1NtTu8" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
-          </node>
-          <node concept="ZYGn8" id="1lex4TVpCxq" role="ZWbT9">
-            <node concept="3clFbS" id="1lex4TVpCxr" role="2VODD2">
-              <node concept="3clFbF" id="1lex4TVpCxs" role="3cqZAp">
-                <node concept="Xl_RD" id="1lex4TVpCxt" role="3clFbG">
-                  <property role="Xl_RC" value="[" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1eYWM2" id="1lex4TVpCxu" role="3EZMnx">
           <node concept="1eYxTg" id="1lex4TVpCxv" role="1eYxTh">
             <node concept="3clFbS" id="1lex4TVpCxw" role="2VODD2">
@@ -7222,6 +7202,20 @@
             </node>
           </node>
         </node>
+        <node concept="_tjkj" id="$eFy4QwgRu" role="3EZMnx">
+          <node concept="3F1sOY" id="$eFy4QwgRw" role="_tjki">
+            <ref role="1NtTu8" to="s6b7:3tsFshP6ikc" />
+          </node>
+          <node concept="ZYGn8" id="$eFy4QwgRq" role="ZWbT9">
+            <node concept="3clFbS" id="$eFy4QwgRs" role="2VODD2">
+              <node concept="3clFbF" id="$eFy4QwgRm" role="3cqZAp">
+                <node concept="Xl_RD" id="$eFy4QwgRo" role="3clFbG">
+                  <property role="Xl_RC" value="[" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="37jFXN" id="1lex4TVpCyq" role="3F10Kt">
           <property role="37lx6p" value="hZ7kQ4a/CENTER" />
         </node>
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
index 86eb5ee9d2..9fb9af3d62 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
@@ -38,6 +38,9 @@
         <property id="1932269937152561478" name="useLabelSelection" index="OXtK3" />
         <property id="1229432188737" name="isLastPosition" index="ZRATv" />
       </concept>
+      <concept id="1227182079811" name="jetbrains.mps.lang.test.structure.TypeKeyStatement" flags="nn" index="2TK7Tu">
+        <property id="1227184461946" name="keys" index="2TTd_B" />
+      </concept>
       <concept id="4239542196496927193" name="jetbrains.mps.lang.test.structure.MPSActionReference" flags="ng" index="1iFQzN">
         <reference id="4239542196496929559" name="action" index="1iFR8X" />
       </concept>
@@ -1637,5 +1640,80 @@
       </node>
     </node>
   </node>
+  <node concept="LiM7Y" id="$eFy4RvrMh">
+    <property role="TrG5h" value="TypeSemicolonFeature" />
+    <node concept="1qefOq" id="$eFy4RvrMi" role="25YQCW">
+      <node concept="12iwZl" id="$eFy4RvrMk" role="1qenE9">
+        <property role="bVyBI" value="-151275731" />
+        <node concept="12iwV3" id="$eFy4RvrMl" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iwV3" id="$eFy4RvrMm" role="12iwVe">
+            <property role="TrG5h" value="d" />
+            <node concept="LIFWc" id="$eFy4RvMP3" role="lGtFl">
+              <property role="ZRATv" value="true" />
+              <property role="OXtK3" value="true" />
+              <property role="p6zMq" value="1" />
+              <property role="p6zMs" value="1" />
+              <property role="LIFWd" value="property_name" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="$eFy4RvrMp" role="25YQFr">
+      <node concept="12iwZl" id="$eFy4RvrMn" role="1qenE9">
+        <property role="bVyBI" value="-597388075" />
+        <node concept="12iwV3" id="$eFy4RvrMo" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iSMG" id="$eFy4RvrMs" role="12iwVe">
+            <property role="TrG5h" value="d" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="$eFy4RvrNX" role="LjaKd">
+      <node concept="2TK7Tu" id="$eFy4RvrNW" role="3cqZAp">
+        <property role="2TTd_B" value=":" />
+      </node>
+    </node>
+  </node>
+  <node concept="LiM7Y" id="$eFy4RIB1K">
+    <property role="TrG5h" value="TypeBracketFeature" />
+    <node concept="1qefOq" id="$eFy4RIB1L" role="25YQCW">
+      <node concept="12iwZl" id="$eFy4RIB1M" role="1qenE9">
+        <property role="bVyBI" value="-151275731" />
+        <node concept="12iwV3" id="$eFy4RIB1N" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iwV3" id="$eFy4RIB1O" role="12iwVe">
+            <property role="TrG5h" value="d" />
+            <node concept="LIFWc" id="$eFy4RIB1P" role="lGtFl">
+              <property role="ZRATv" value="true" />
+              <property role="OXtK3" value="true" />
+              <property role="p6zMq" value="1" />
+              <property role="p6zMs" value="1" />
+              <property role="LIFWd" value="property_name" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="$eFy4RIB1Q" role="25YQFr">
+      <node concept="12iwZl" id="$eFy4RIB1R" role="1qenE9">
+        <property role="bVyBI" value="345593971" />
+        <node concept="12iwV3" id="$eFy4RIB1S" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iwV3" id="$eFy4RIB1W" role="12iwVe">
+            <property role="TrG5h" value="d" />
+            <node concept="12h7s0" id="$eFy4RIB1Y" role="12hoz8" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="$eFy4RIB1U" role="LjaKd">
+      <node concept="2TK7Tu" id="$eFy4RIB1V" role="3cqZAp">
+        <property role="2TTd_B" value="[" />
+      </node>
+    </node>
+  </node>
 </model>
 

From d2722e0a229d76744d000e768deda8993ce5493b Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Fri, 12 Jun 2026 12:24:38 +0200
Subject: [PATCH 3/9] Fix: Type ':' at Feature with Cardinality to get
 FeatureModelInclude (#739)

---
 ...3.variability.featuremodel.base.editor.mps | 184 ++++++++++++++++--
 ...variability.os.sandbox.notpresentvalue.mps |  16 ++
 ...ability.featuremodel.base.editor@tests.mps |  45 +++++
 3 files changed, 231 insertions(+), 14 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
index 87acf560b3..342fe8735a 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
@@ -49,9 +49,9 @@
     <import index="n8u2" ref="r:452e57fa-fd4c-45a8-b9ba-964614a5a66e(org.iets3.variability.base.behavior)" />
     <import index="2rbz" ref="r:aeef8772-8af4-45c3-a762-623d4009d953(org.iets3.variability.base.plugin)" />
     <import index="hdhb" ref="r:07568eb8-30c0-4bb3-9dcb-50ee4b8de59a(jetbrains.mps.vcs.diff.ui.common)" />
+    <import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" />
     <import index="itrz" ref="r:80fb0853-eb3b-4e84-aebd-cc7fdb011d97(org.iets3.core.base.editor)" implicit="true" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
-    <import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" implicit="true" />
     <import index="av1m" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.style(MPS.Editor/)" implicit="true" />
     <import index="700h" ref="r:61b1de80-490d-4fee-8e95-b956503290e9(org.iets3.core.expr.collections.structure)" implicit="true" />
   </imports>
@@ -7166,27 +7166,40 @@
                 </node>
               </node>
               <node concept="3clFbF" id="1lex4TVpCyb" role="3cqZAp">
-                <node concept="1Wc70l" id="1lex4TVpCyc" role="3clFbG">
-                  <node concept="2OqwBi" id="1lex4TVpCyd" role="3uHU7w">
-                    <node concept="2OqwBi" id="1lex4TVpCye" role="2Oq$k0">
-                      <node concept="37vLTw" id="1lex4TVpCyf" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1lex4TVpCy4" resolve="node" />
+                <node concept="1Wc70l" id="$eFy4S0JJ3" role="3clFbG">
+                  <node concept="1Wc70l" id="1lex4TVpCyc" role="3uHU7B">
+                    <node concept="3fqX7Q" id="1lex4TVpCyi" role="3uHU7B">
+                      <node concept="2OqwBi" id="1lex4TVpCyj" role="3fr31v">
+                        <node concept="37vLTw" id="1lex4TVpCyk" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1lex4TVpCy4" resolve="node" />
+                        </node>
+                        <node concept="2qgKlT" id="1lex4TVpCyl" role="2OqNvi">
+                          <ref role="37wK5l" to="zccc:7Nu9WvXvoDo" resolve="isRoot" />
+                        </node>
                       </node>
-                      <node concept="2qgKlT" id="1lex4TVpCyg" role="2OqNvi">
-                        <ref role="37wK5l" to="zccc:6GZHy357BW_" resolve="subFeatures" />
+                    </node>
+                    <node concept="2OqwBi" id="1lex4TVpCyd" role="3uHU7w">
+                      <node concept="2OqwBi" id="1lex4TVpCye" role="2Oq$k0">
+                        <node concept="37vLTw" id="1lex4TVpCyf" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1lex4TVpCy4" resolve="node" />
+                        </node>
+                        <node concept="2qgKlT" id="1lex4TVpCyg" role="2OqNvi">
+                          <ref role="37wK5l" to="zccc:6GZHy357BW_" resolve="subFeatures" />
+                        </node>
                       </node>
+                      <node concept="1v1jN8" id="1lex4TVpCyh" role="2OqNvi" />
                     </node>
-                    <node concept="1v1jN8" id="1lex4TVpCyh" role="2OqNvi" />
                   </node>
-                  <node concept="3fqX7Q" id="1lex4TVpCyi" role="3uHU7B">
-                    <node concept="2OqwBi" id="1lex4TVpCyj" role="3fr31v">
-                      <node concept="37vLTw" id="1lex4TVpCyk" role="2Oq$k0">
+                  <node concept="2OqwBi" id="$eFy4RXZRz" role="3uHU7w">
+                    <node concept="2OqwBi" id="$eFy4RXWJy" role="2Oq$k0">
+                      <node concept="37vLTw" id="$eFy4RXVLT" role="2Oq$k0">
                         <ref role="3cqZAo" node="1lex4TVpCy4" resolve="node" />
                       </node>
-                      <node concept="2qgKlT" id="1lex4TVpCyl" role="2OqNvi">
-                        <ref role="37wK5l" to="zccc:7Nu9WvXvoDo" resolve="isRoot" />
+                      <node concept="3TrEf2" id="$eFy4RXYqC" role="2OqNvi">
+                        <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" />
                       </node>
                     </node>
+                    <node concept="3w_OXm" id="$eFy4RY0Kj" role="2OqNvi" />
                   </node>
                 </node>
               </node>
@@ -7216,6 +7229,149 @@
             </node>
           </node>
         </node>
+        <node concept="1eYWM2" id="$eFy4RJg1n" role="3EZMnx">
+          <node concept="1eYxTg" id="$eFy4RJg1o" role="1eYxTh">
+            <node concept="3clFbS" id="$eFy4RJg1p" role="2VODD2">
+              <node concept="3cpWs8" id="$eFy4RJg1q" role="3cqZAp">
+                <node concept="3cpWsn" id="$eFy4RJg1r" role="3cpWs9">
+                  <property role="TrG5h" value="node" />
+                  <node concept="3Tqbb2" id="$eFy4RJg1s" role="1tU5fm">
+                    <ref role="ehGHo" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
+                  </node>
+                  <node concept="1PxgMI" id="$eFy4RJg1t" role="33vP2m">
+                    <node concept="2OqwBi" id="$eFy4RJg1u" role="1m5AlR">
+                      <node concept="2kS8pE" id="$eFy4RJg1v" role="2Oq$k0" />
+                      <node concept="liA8E" id="$eFy4RJg1w" role="2OqNvi">
+                        <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
+                      </node>
+                    </node>
+                    <node concept="chp4Y" id="$eFy4RJg1x" role="3oSUPX">
+                      <ref role="cht4Q" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="$eFy4RJg1y" role="3cqZAp">
+                <node concept="3cpWsn" id="$eFy4RJg1z" role="3cpWs9">
+                  <property role="TrG5h" value="fi" />
+                  <node concept="3Tqbb2" id="$eFy4RJg1$" role="1tU5fm">
+                    <ref role="ehGHo" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
+                  </node>
+                  <node concept="2OqwBi" id="$eFy4RJg1_" role="33vP2m">
+                    <node concept="37vLTw" id="$eFy4RJg1A" role="2Oq$k0">
+                      <ref role="3cqZAo" node="$eFy4RJg1r" resolve="node" />
+                    </node>
+                    <node concept="2DeJnW" id="$eFy4RJg1B" role="2OqNvi">
+                      <ref role="1_rbq0" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="$eFy4RJg1C" role="3cqZAp">
+                <node concept="37vLTI" id="$eFy4RJg1D" role="3clFbG">
+                  <node concept="2OqwBi" id="$eFy4RJg1E" role="37vLTx">
+                    <node concept="37vLTw" id="$eFy4RJg1F" role="2Oq$k0">
+                      <ref role="3cqZAo" node="$eFy4RJg1r" resolve="node" />
+                    </node>
+                    <node concept="3TrcHB" id="$eFy4RJg1G" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="$eFy4RJg1H" role="37vLTJ">
+                    <node concept="37vLTw" id="$eFy4RJg1I" role="2Oq$k0">
+                      <ref role="3cqZAo" node="$eFy4RJg1z" resolve="fi" />
+                    </node>
+                    <node concept="3TrcHB" id="$eFy4RJg1J" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="$eFy4RJg1K" role="3cqZAp">
+                <node concept="37vLTI" id="$eFy4RJg1L" role="3clFbG">
+                  <node concept="2OqwBi" id="$eFy4RJg1M" role="37vLTx">
+                    <node concept="37vLTw" id="$eFy4RJg1N" role="2Oq$k0">
+                      <ref role="3cqZAo" node="$eFy4RJg1r" resolve="node" />
+                    </node>
+                    <node concept="3TrEf2" id="$eFy4RJg1O" role="2OqNvi">
+                      <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="$eFy4RJg1P" role="37vLTJ">
+                    <node concept="37vLTw" id="$eFy4RJg1Q" role="2Oq$k0">
+                      <ref role="3cqZAo" node="$eFy4RJg1z" resolve="fi" />
+                    </node>
+                    <node concept="3TrEf2" id="$eFy4RJg1R" role="2OqNvi">
+                      <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="$eFy4RJg1S" role="3cqZAp">
+                <node concept="37vLTw" id="$eFy4RJg1T" role="3clFbG">
+                  <ref role="3cqZAo" node="$eFy4RJg1z" resolve="fi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1eYwpX" id="$eFy4RJg1U" role="1eYxym">
+            <node concept="3clFbS" id="$eFy4RJg1V" role="2VODD2">
+              <node concept="3cpWs8" id="$eFy4RJg1W" role="3cqZAp">
+                <node concept="3cpWsn" id="$eFy4RJg1X" role="3cpWs9">
+                  <property role="TrG5h" value="node" />
+                  <node concept="3Tqbb2" id="$eFy4RJg1Y" role="1tU5fm">
+                    <ref role="ehGHo" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
+                  </node>
+                  <node concept="1PxgMI" id="$eFy4RJg1Z" role="33vP2m">
+                    <node concept="chp4Y" id="$eFy4RJg20" role="3oSUPX">
+                      <ref role="cht4Q" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
+                    </node>
+                    <node concept="2OqwBi" id="$eFy4RJg21" role="1m5AlR">
+                      <node concept="2kS8pE" id="$eFy4RJg22" role="2Oq$k0" />
+                      <node concept="liA8E" id="$eFy4RJg23" role="2OqNvi">
+                        <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="$eFy4RJg24" role="3cqZAp">
+                <node concept="1Wc70l" id="$eFy4RJg25" role="3clFbG">
+                  <node concept="3fqX7Q" id="$eFy4RJg2b" role="3uHU7B">
+                    <node concept="2OqwBi" id="$eFy4RJg2c" role="3fr31v">
+                      <node concept="37vLTw" id="$eFy4RJg2d" role="2Oq$k0">
+                        <ref role="3cqZAo" node="$eFy4RJg1X" resolve="node" />
+                      </node>
+                      <node concept="2qgKlT" id="$eFy4RJg2e" role="2OqNvi">
+                        <ref role="37wK5l" to="zccc:7Nu9WvXvoDo" resolve="isRoot" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="$eFy4RJg26" role="3uHU7w">
+                    <node concept="2OqwBi" id="$eFy4RJg27" role="2Oq$k0">
+                      <node concept="37vLTw" id="$eFy4RJg28" role="2Oq$k0">
+                        <ref role="3cqZAo" node="$eFy4RJg1X" resolve="node" />
+                      </node>
+                      <node concept="2qgKlT" id="$eFy4RJg29" role="2OqNvi">
+                        <ref role="37wK5l" to="zccc:6GZHy357BW_" resolve="subFeatures" />
+                      </node>
+                    </node>
+                    <node concept="1v1jN8" id="$eFy4RJg2a" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1eYWSL" id="$eFy4RJg2f" role="1eYxyj">
+            <node concept="3clFbS" id="$eFy4RJg2g" role="2VODD2">
+              <node concept="3clFbF" id="$eFy4RJg2h" role="3cqZAp">
+                <node concept="Xl_RD" id="$eFy4RJg2i" role="3clFbG">
+                  <property role="Xl_RC" value=":" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="37jFXN" id="1lex4TVpCyq" role="3F10Kt">
           <property role="37lx6p" value="hZ7kQ4a/CENTER" />
         </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
index c99d2b0c61..6ac8773751 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
@@ -30,6 +30,7 @@
       </concept>
     </language>
     <language id="9b66c5c9-38bf-4315-a96f-9f4e212c69cb" name="org.iets3.variability.base">
+      <concept id="3989254429232912648" name="org.iets3.variability.base.structure.EmptyVariabilityContent" flags="ng" index="12i7jc" />
       <concept id="3989254429232883574" name="org.iets3.variability.base.structure.VariabilityModelChunk" flags="ng" index="12icEM">
         <child id="3989254429232890937" name="contents" index="12i2BX" />
       </concept>
@@ -134,6 +135,21 @@
         </node>
       </node>
     </node>
+    <node concept="12i7jc" id="5miEvCz_XOR" role="12i2BX" />
+    <node concept="12i7jc" id="5miEvCz_XOS" role="12i2BX" />
+    <node concept="12i7jc" id="5miEvCz_XOT" role="12i2BX" />
+    <node concept="12iwZl" id="5miEvCz_XSd" role="12i2BX">
+      <property role="bVyBI" value="181071613" />
+      <node concept="12iwV3" id="5miEvCz_XSe" role="12iwV8">
+        <property role="TrG5h" value="M" />
+        <node concept="12iwV3" id="$eFy4P3JKT" role="12iwVe">
+          <property role="TrG5h" value="f" />
+          <node concept="12iwV3" id="$eFy4RvrsL" role="12iwVe">
+            <property role="TrG5h" value="g" />
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
index 9fb9af3d62..13ef629921 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
@@ -1715,5 +1715,50 @@
       </node>
     </node>
   </node>
+  <node concept="LiM7Y" id="$eFy4S3xZs">
+    <property role="TrG5h" value="TypeSemicolonFeatureCardinality" />
+    <node concept="1qefOq" id="$eFy4S3xZt" role="25YQCW">
+      <node concept="12iwZl" id="$eFy4S3xZu" role="1qenE9">
+        <property role="bVyBI" value="2011136116" />
+        <node concept="12iwV3" id="$eFy4S3xZv" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iwV3" id="$eFy4S3xZw" role="12iwVe">
+            <property role="TrG5h" value="d" />
+            <node concept="12h7s0" id="$eFy4S3SXr" role="12hoz8">
+              <property role="21J4rj" value="1" />
+              <property role="2jfDHK" value="1" />
+              <node concept="LIFWc" id="$eFy4S3SXw" role="lGtFl">
+                <property role="ZRATv" value="true" />
+                <property role="OXtK3" value="true" />
+                <property role="p6zMq" value="1" />
+                <property role="p6zMs" value="1" />
+                <property role="LIFWd" value="Constant_8jpa7_e0" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="$eFy4S3xZy" role="25YQFr">
+      <node concept="12iwZl" id="$eFy4S3xZz" role="1qenE9">
+        <property role="bVyBI" value="1153279068" />
+        <node concept="12iwV3" id="$eFy4S3xZ$" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iSMG" id="$eFy4S3xZH" role="12iwVe">
+            <property role="TrG5h" value="d" />
+            <node concept="12h7s0" id="$eFy4S3xZA" role="12hoz8">
+              <property role="21J4rj" value="1" />
+              <property role="2jfDHK" value="1" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="$eFy4S3xZB" role="LjaKd">
+      <node concept="2TK7Tu" id="$eFy4S3xZC" role="3cqZAp">
+        <property role="2TTd_B" value=":" />
+      </node>
+    </node>
+  </node>
 </model>
 

From 9aa2d1dba2c4d6d9264ccf97d348e692d2bbb576 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Fri, 12 Jun 2026 12:40:08 +0200
Subject: [PATCH 4/9] Refactor common code to method (#739)

---
 ...3.variability.featuremodel.base.editor.mps | 267 ++++++++----------
 1 file changed, 111 insertions(+), 156 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
index 342fe8735a..f1d8a63914 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
@@ -469,6 +469,7 @@
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
@@ -7062,84 +7063,11 @@
         <node concept="1eYWM2" id="1lex4TVpCxu" role="3EZMnx">
           <node concept="1eYxTg" id="1lex4TVpCxv" role="1eYxTh">
             <node concept="3clFbS" id="1lex4TVpCxw" role="2VODD2">
-              <node concept="3cpWs8" id="1lex4TVpCxx" role="3cqZAp">
-                <node concept="3cpWsn" id="1lex4TVpCxy" role="3cpWs9">
-                  <property role="TrG5h" value="node" />
-                  <node concept="3Tqbb2" id="1lex4TVpCxz" role="1tU5fm">
-                    <ref role="ehGHo" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
-                  </node>
-                  <node concept="1PxgMI" id="1lex4TVpCx$" role="33vP2m">
-                    <node concept="2OqwBi" id="1lex4TVpCx_" role="1m5AlR">
-                      <node concept="2kS8pE" id="1lex4TVpCxA" role="2Oq$k0" />
-                      <node concept="liA8E" id="1lex4TVpCxB" role="2OqNvi">
-                        <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
-                      </node>
-                    </node>
-                    <node concept="chp4Y" id="1lex4TVpCxC" role="3oSUPX">
-                      <ref role="cht4Q" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="1lex4TVpCxD" role="3cqZAp">
-                <node concept="3cpWsn" id="1lex4TVpCxE" role="3cpWs9">
-                  <property role="TrG5h" value="fi" />
-                  <node concept="3Tqbb2" id="1lex4TVpCxF" role="1tU5fm">
-                    <ref role="ehGHo" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
-                  </node>
-                  <node concept="2OqwBi" id="1lex4TVpCxG" role="33vP2m">
-                    <node concept="37vLTw" id="1lex4TVpCxH" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxy" resolve="node" />
-                    </node>
-                    <node concept="2DeJnW" id="1lex4TVpCxI" role="2OqNvi">
-                      <ref role="1_rbq0" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1lex4TVpCxJ" role="3cqZAp">
-                <node concept="37vLTI" id="1lex4TVpCxK" role="3clFbG">
-                  <node concept="2OqwBi" id="1lex4TVpCxL" role="37vLTx">
-                    <node concept="37vLTw" id="1lex4TVpCxM" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxy" resolve="node" />
-                    </node>
-                    <node concept="3TrcHB" id="1lex4TVpCxN" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="1lex4TVpCxO" role="37vLTJ">
-                    <node concept="37vLTw" id="1lex4TVpCxP" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxE" resolve="fi" />
-                    </node>
-                    <node concept="3TrcHB" id="1lex4TVpCxQ" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1lex4TVpCxR" role="3cqZAp">
-                <node concept="37vLTI" id="1lex4TVpCxS" role="3clFbG">
-                  <node concept="2OqwBi" id="1lex4TVpCxT" role="37vLTx">
-                    <node concept="37vLTw" id="1lex4TVpCxU" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxy" resolve="node" />
-                    </node>
-                    <node concept="3TrEf2" id="1lex4TVpCxV" role="2OqNvi">
-                      <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="1lex4TVpCxW" role="37vLTJ">
-                    <node concept="37vLTw" id="1lex4TVpCxX" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1lex4TVpCxE" resolve="fi" />
-                    </node>
-                    <node concept="3TrEf2" id="1lex4TVpCxY" role="2OqNvi">
-                      <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1lex4TVpCxZ" role="3cqZAp">
-                <node concept="37vLTw" id="1lex4TVpCy0" role="3clFbG">
-                  <ref role="3cqZAo" node="1lex4TVpCxE" resolve="fi" />
+              <node concept="3cpWs6" id="$eFy4S43G4" role="3cqZAp">
+                <node concept="2YIFZM" id="$eFy4S43G3" role="3cqZAk">
+                  <ref role="1Pybhc" node="$eFy4S43DI" resolve="TopPartFeatureUtil" />
+                  <ref role="37wK5l" node="$eFy4S43FZ" resolve="featureModelIncludeTransform" />
+                  <node concept="2kS8pE" id="$eFy4S43G2" role="37wK5m" />
                 </node>
               </node>
             </node>
@@ -7232,84 +7160,11 @@
         <node concept="1eYWM2" id="$eFy4RJg1n" role="3EZMnx">
           <node concept="1eYxTg" id="$eFy4RJg1o" role="1eYxTh">
             <node concept="3clFbS" id="$eFy4RJg1p" role="2VODD2">
-              <node concept="3cpWs8" id="$eFy4RJg1q" role="3cqZAp">
-                <node concept="3cpWsn" id="$eFy4RJg1r" role="3cpWs9">
-                  <property role="TrG5h" value="node" />
-                  <node concept="3Tqbb2" id="$eFy4RJg1s" role="1tU5fm">
-                    <ref role="ehGHo" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
-                  </node>
-                  <node concept="1PxgMI" id="$eFy4RJg1t" role="33vP2m">
-                    <node concept="2OqwBi" id="$eFy4RJg1u" role="1m5AlR">
-                      <node concept="2kS8pE" id="$eFy4RJg1v" role="2Oq$k0" />
-                      <node concept="liA8E" id="$eFy4RJg1w" role="2OqNvi">
-                        <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
-                      </node>
-                    </node>
-                    <node concept="chp4Y" id="$eFy4RJg1x" role="3oSUPX">
-                      <ref role="cht4Q" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="$eFy4RJg1y" role="3cqZAp">
-                <node concept="3cpWsn" id="$eFy4RJg1z" role="3cpWs9">
-                  <property role="TrG5h" value="fi" />
-                  <node concept="3Tqbb2" id="$eFy4RJg1$" role="1tU5fm">
-                    <ref role="ehGHo" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
-                  </node>
-                  <node concept="2OqwBi" id="$eFy4RJg1_" role="33vP2m">
-                    <node concept="37vLTw" id="$eFy4RJg1A" role="2Oq$k0">
-                      <ref role="3cqZAo" node="$eFy4RJg1r" resolve="node" />
-                    </node>
-                    <node concept="2DeJnW" id="$eFy4RJg1B" role="2OqNvi">
-                      <ref role="1_rbq0" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="$eFy4RJg1C" role="3cqZAp">
-                <node concept="37vLTI" id="$eFy4RJg1D" role="3clFbG">
-                  <node concept="2OqwBi" id="$eFy4RJg1E" role="37vLTx">
-                    <node concept="37vLTw" id="$eFy4RJg1F" role="2Oq$k0">
-                      <ref role="3cqZAo" node="$eFy4RJg1r" resolve="node" />
-                    </node>
-                    <node concept="3TrcHB" id="$eFy4RJg1G" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="$eFy4RJg1H" role="37vLTJ">
-                    <node concept="37vLTw" id="$eFy4RJg1I" role="2Oq$k0">
-                      <ref role="3cqZAo" node="$eFy4RJg1z" resolve="fi" />
-                    </node>
-                    <node concept="3TrcHB" id="$eFy4RJg1J" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="$eFy4RJg1K" role="3cqZAp">
-                <node concept="37vLTI" id="$eFy4RJg1L" role="3clFbG">
-                  <node concept="2OqwBi" id="$eFy4RJg1M" role="37vLTx">
-                    <node concept="37vLTw" id="$eFy4RJg1N" role="2Oq$k0">
-                      <ref role="3cqZAo" node="$eFy4RJg1r" resolve="node" />
-                    </node>
-                    <node concept="3TrEf2" id="$eFy4RJg1O" role="2OqNvi">
-                      <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="$eFy4RJg1P" role="37vLTJ">
-                    <node concept="37vLTw" id="$eFy4RJg1Q" role="2Oq$k0">
-                      <ref role="3cqZAo" node="$eFy4RJg1z" resolve="fi" />
-                    </node>
-                    <node concept="3TrEf2" id="$eFy4RJg1R" role="2OqNvi">
-                      <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="$eFy4RJg1S" role="3cqZAp">
-                <node concept="37vLTw" id="$eFy4RJg1T" role="3clFbG">
-                  <ref role="3cqZAo" node="$eFy4RJg1z" resolve="fi" />
+              <node concept="3cpWs6" id="$eFy4S43Zn" role="3cqZAp">
+                <node concept="2YIFZM" id="$eFy4S43Zo" role="3cqZAk">
+                  <ref role="1Pybhc" node="$eFy4S43DI" resolve="TopPartFeatureUtil" />
+                  <ref role="37wK5l" node="$eFy4S43FZ" resolve="featureModelIncludeTransform" />
+                  <node concept="2kS8pE" id="$eFy4S43Zp" role="37wK5m" />
                 </node>
               </node>
             </node>
@@ -9198,5 +9053,105 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="$eFy4S43DI">
+    <property role="TrG5h" value="TopPartFeatureUtil" />
+    <property role="3GE5qa" value="treenodes" />
+    <node concept="3Tm1VV" id="$eFy4S43DJ" role="1B3o_S" />
+    <node concept="2YIFZL" id="$eFy4S43FZ" role="jymVt">
+      <property role="TrG5h" value="featureModelIncludeTransform" />
+      <node concept="3Tmbuc" id="$eFy4S43G0" role="1B3o_S" />
+      <node concept="3Tqbb2" id="$eFy4S43G1" role="3clF45" />
+      <node concept="37vLTG" id="$eFy4S43FU" role="3clF46">
+        <property role="TrG5h" value="_context" />
+        <node concept="3uibUv" id="$eFy4S43FV" role="1tU5fm">
+          <ref role="3uigEE" to="uddc:~TransformationMenuContext" resolve="TransformationMenuContext" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="$eFy4S43Fp" role="3clF47">
+        <node concept="3cpWs8" id="$eFy4S43Fq" role="3cqZAp">
+          <node concept="3cpWsn" id="$eFy4S43Fr" role="3cpWs9">
+            <property role="TrG5h" value="node" />
+            <node concept="3Tqbb2" id="$eFy4S43Fs" role="1tU5fm">
+              <ref role="ehGHo" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
+            </node>
+            <node concept="1PxgMI" id="$eFy4S43Ft" role="33vP2m">
+              <node concept="2OqwBi" id="$eFy4S43Fu" role="1m5AlR">
+                <node concept="37vLTw" id="$eFy4S43FW" role="2Oq$k0">
+                  <ref role="3cqZAo" node="$eFy4S43FU" resolve="_context" />
+                </node>
+                <node concept="liA8E" id="$eFy4S43Fw" role="2OqNvi">
+                  <ref role="37wK5l" to="uddc:~TransformationMenuContext.getNode()" resolve="getNode" />
+                </node>
+              </node>
+              <node concept="chp4Y" id="$eFy4S43Fx" role="3oSUPX">
+                <ref role="cht4Q" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="$eFy4S43Fy" role="3cqZAp">
+          <node concept="3cpWsn" id="$eFy4S43Fz" role="3cpWs9">
+            <property role="TrG5h" value="fi" />
+            <node concept="3Tqbb2" id="$eFy4S43F$" role="1tU5fm">
+              <ref role="ehGHo" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
+            </node>
+            <node concept="2OqwBi" id="$eFy4S43F_" role="33vP2m">
+              <node concept="37vLTw" id="$eFy4S43FA" role="2Oq$k0">
+                <ref role="3cqZAo" node="$eFy4S43Fr" resolve="node" />
+              </node>
+              <node concept="2DeJnW" id="$eFy4S43FB" role="2OqNvi">
+                <ref role="1_rbq0" to="s6b7:3tsFshP5M5C" resolve="FeatureModelInclude" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="$eFy4S43FC" role="3cqZAp">
+          <node concept="37vLTI" id="$eFy4S43FD" role="3clFbG">
+            <node concept="2OqwBi" id="$eFy4S43FE" role="37vLTx">
+              <node concept="37vLTw" id="$eFy4S43FF" role="2Oq$k0">
+                <ref role="3cqZAo" node="$eFy4S43Fr" resolve="node" />
+              </node>
+              <node concept="3TrcHB" id="$eFy4S43FG" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="$eFy4S43FH" role="37vLTJ">
+              <node concept="37vLTw" id="$eFy4S43FI" role="2Oq$k0">
+                <ref role="3cqZAo" node="$eFy4S43Fz" resolve="fi" />
+              </node>
+              <node concept="3TrcHB" id="$eFy4S43FJ" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="$eFy4S43FK" role="3cqZAp">
+          <node concept="37vLTI" id="$eFy4S43FL" role="3clFbG">
+            <node concept="2OqwBi" id="$eFy4S43FM" role="37vLTx">
+              <node concept="37vLTw" id="$eFy4S43FN" role="2Oq$k0">
+                <ref role="3cqZAo" node="$eFy4S43Fr" resolve="node" />
+              </node>
+              <node concept="3TrEf2" id="$eFy4S43FO" role="2OqNvi">
+                <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="$eFy4S43FP" role="37vLTJ">
+              <node concept="37vLTw" id="$eFy4S43FQ" role="2Oq$k0">
+                <ref role="3cqZAo" node="$eFy4S43Fz" resolve="fi" />
+              </node>
+              <node concept="3TrEf2" id="$eFy4S43FR" role="2OqNvi">
+                <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="$eFy4S43FS" role="3cqZAp">
+          <node concept="37vLTw" id="$eFy4S43FT" role="3clFbG">
+            <ref role="3cqZAo" node="$eFy4S43Fz" resolve="fi" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 

From 9e2584e5c86cc45da27f3a85ef7474b7c2e2f6ab Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Fri, 12 Jun 2026 13:08:06 +0200
Subject: [PATCH 5/9] Fix Test (#739)

---
 .../models/org.iets3.variability.featuremodel.base.editor.mps  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
index f1d8a63914..eaca5fddc7 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
@@ -7057,6 +7057,7 @@
             </node>
           </node>
         </node>
+        <node concept="3F0ifn" id="$eFy4THtE3" role="3EZMnx" />
         <node concept="3F0A7n" id="1lex4TVpCxn" role="3EZMnx">
           <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         </node>
@@ -7124,7 +7125,7 @@
                         <ref role="3cqZAo" node="1lex4TVpCy4" resolve="node" />
                       </node>
                       <node concept="3TrEf2" id="$eFy4RXYqC" role="2OqNvi">
-                        <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" />
+                        <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
                       </node>
                     </node>
                     <node concept="3w_OXm" id="$eFy4RY0Kj" role="2OqNvi" />

From 127773eb8036f12c230f568f0a4d5fb87d212f44 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Fri, 12 Jun 2026 15:04:07 +0200
Subject: [PATCH 6/9] migrate (#739)

---
 .../models/org.iets3.variability.featuremodel.base.editor.mps   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
index eaca5fddc7..bf6f38b846 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
@@ -7146,7 +7146,7 @@
         </node>
         <node concept="_tjkj" id="$eFy4QwgRu" role="3EZMnx">
           <node concept="3F1sOY" id="$eFy4QwgRw" role="_tjki">
-            <ref role="1NtTu8" to="s6b7:3tsFshP6ikc" />
+            <ref role="1NtTu8" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
           </node>
           <node concept="ZYGn8" id="$eFy4QwgRq" role="ZWbT9">
             <node concept="3clFbS" id="$eFy4QwgRs" role="2VODD2">

From c2d4094c4ad79fa78e76392d42d5d08f6afb81b6 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Mon, 15 Jun 2026 08:44:08 +0200
Subject: [PATCH 7/9] Add Editortest typing cardinality bracket before
 semicolon (#739)

---
 ...variability.os.sandbox.notpresentvalue.mps |  8 +++-
 ...ability.featuremodel.base.editor@tests.mps | 42 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
index 6ac8773751..3e4e322a43 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
@@ -63,6 +63,9 @@
         <child id="3989254429233029900" name="root" index="12iwV8" />
         <child id="5504663836844191437" name="constraints" index="1Rrh1l" />
       </concept>
+      <concept id="3989254429233062248" name="org.iets3.variability.featuremodel.base.structure.FeatureModelInclude" flags="ng" index="12iSMG">
+        <reference id="3989254429233062249" name="fm" index="12iSMH" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
@@ -139,13 +142,14 @@
     <node concept="12i7jc" id="5miEvCz_XOS" role="12i2BX" />
     <node concept="12i7jc" id="5miEvCz_XOT" role="12i2BX" />
     <node concept="12iwZl" id="5miEvCz_XSd" role="12i2BX">
-      <property role="bVyBI" value="181071613" />
+      <property role="bVyBI" value="1011413737" />
       <node concept="12iwV3" id="5miEvCz_XSe" role="12iwV8">
         <property role="TrG5h" value="M" />
         <node concept="12iwV3" id="$eFy4P3JKT" role="12iwVe">
           <property role="TrG5h" value="f" />
-          <node concept="12iwV3" id="$eFy4RvrsL" role="12iwVe">
+          <node concept="12iSMG" id="3uwMEO1m_IF" role="12iwVe">
             <property role="TrG5h" value="g" />
+            <ref role="12iSMH" node="3TeKUdOiNIJ" />
           </node>
         </node>
       </node>
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
index 13ef629921..d14c05bbcb 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
@@ -1678,7 +1678,7 @@
     </node>
   </node>
   <node concept="LiM7Y" id="$eFy4RIB1K">
-    <property role="TrG5h" value="TypeBracketFeature" />
+    <property role="TrG5h" value="TypeCardinalityBracketFeature" />
     <node concept="1qefOq" id="$eFy4RIB1L" role="25YQCW">
       <node concept="12iwZl" id="$eFy4RIB1M" role="1qenE9">
         <property role="bVyBI" value="-151275731" />
@@ -1716,7 +1716,7 @@
     </node>
   </node>
   <node concept="LiM7Y" id="$eFy4S3xZs">
-    <property role="TrG5h" value="TypeSemicolonFeatureCardinality" />
+    <property role="TrG5h" value="TypeSemicolonAfterCardinalityBracket" />
     <node concept="1qefOq" id="$eFy4S3xZt" role="25YQCW">
       <node concept="12iwZl" id="$eFy4S3xZu" role="1qenE9">
         <property role="bVyBI" value="2011136116" />
@@ -1760,5 +1760,43 @@
       </node>
     </node>
   </node>
+  <node concept="LiM7Y" id="3uwMEO1mAp4">
+    <property role="TrG5h" value="TypeCardinalityBracketBeforeSemicolon" />
+    <node concept="1qefOq" id="3uwMEO1mAp5" role="25YQCW">
+      <node concept="12iwZl" id="3uwMEO1mAp6" role="1qenE9">
+        <property role="bVyBI" value="-597388075" />
+        <node concept="12iwV3" id="3uwMEO1mAp7" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iSMG" id="3uwMEO1mP4Q" role="12iwVe">
+            <property role="TrG5h" value="d" />
+            <node concept="LIFWc" id="3uwMEO1mPaI" role="lGtFl">
+              <property role="ZRATv" value="true" />
+              <property role="OXtK3" value="true" />
+              <property role="p6zMq" value="1" />
+              <property role="p6zMs" value="1" />
+              <property role="LIFWd" value="property_name" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="3uwMEO1mApb" role="25YQFr">
+      <node concept="12iwZl" id="3uwMEO1n1VN" role="1qenE9">
+        <property role="bVyBI" value="853525083" />
+        <node concept="12iwV3" id="3uwMEO1n1VO" role="12iwV8">
+          <property role="TrG5h" value="M" />
+          <node concept="12iSMG" id="3uwMEO1n1VR" role="12iwVe">
+            <property role="TrG5h" value="d" />
+            <node concept="12h7s0" id="3uwMEO1n1VU" role="12hoz8" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="3uwMEO1mApg" role="LjaKd">
+      <node concept="2TK7Tu" id="3uwMEO1mAph" role="3cqZAp">
+        <property role="2TTd_B" value="[" />
+      </node>
+    </node>
+  </node>
 </model>
 

From de5b827700c51d8f26d45628d8587ab261c131a1 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Mon, 15 Jun 2026 10:20:53 +0200
Subject: [PATCH 8/9] migrate (#739)

---
 ...variability.os.sandbox.notpresentvalue.mps |  2 +-
 ...ability.featuremodel.base.editor@tests.mps | 42 +------------------
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
index 3e4e322a43..bbe6791be9 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
@@ -149,7 +149,7 @@
           <property role="TrG5h" value="f" />
           <node concept="12iSMG" id="3uwMEO1m_IF" role="12iwVe">
             <property role="TrG5h" value="g" />
-            <ref role="12iSMH" node="3TeKUdOiNIJ" />
+            <ref role="12iSMH" node="3TeKUdOiNIJ" resolve="V" />
           </node>
         </node>
       </node>
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
index d14c05bbcb..13ef629921 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
@@ -1678,7 +1678,7 @@
     </node>
   </node>
   <node concept="LiM7Y" id="$eFy4RIB1K">
-    <property role="TrG5h" value="TypeCardinalityBracketFeature" />
+    <property role="TrG5h" value="TypeBracketFeature" />
     <node concept="1qefOq" id="$eFy4RIB1L" role="25YQCW">
       <node concept="12iwZl" id="$eFy4RIB1M" role="1qenE9">
         <property role="bVyBI" value="-151275731" />
@@ -1716,7 +1716,7 @@
     </node>
   </node>
   <node concept="LiM7Y" id="$eFy4S3xZs">
-    <property role="TrG5h" value="TypeSemicolonAfterCardinalityBracket" />
+    <property role="TrG5h" value="TypeSemicolonFeatureCardinality" />
     <node concept="1qefOq" id="$eFy4S3xZt" role="25YQCW">
       <node concept="12iwZl" id="$eFy4S3xZu" role="1qenE9">
         <property role="bVyBI" value="2011136116" />
@@ -1760,43 +1760,5 @@
       </node>
     </node>
   </node>
-  <node concept="LiM7Y" id="3uwMEO1mAp4">
-    <property role="TrG5h" value="TypeCardinalityBracketBeforeSemicolon" />
-    <node concept="1qefOq" id="3uwMEO1mAp5" role="25YQCW">
-      <node concept="12iwZl" id="3uwMEO1mAp6" role="1qenE9">
-        <property role="bVyBI" value="-597388075" />
-        <node concept="12iwV3" id="3uwMEO1mAp7" role="12iwV8">
-          <property role="TrG5h" value="M" />
-          <node concept="12iSMG" id="3uwMEO1mP4Q" role="12iwVe">
-            <property role="TrG5h" value="d" />
-            <node concept="LIFWc" id="3uwMEO1mPaI" role="lGtFl">
-              <property role="ZRATv" value="true" />
-              <property role="OXtK3" value="true" />
-              <property role="p6zMq" value="1" />
-              <property role="p6zMs" value="1" />
-              <property role="LIFWd" value="property_name" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="3uwMEO1mApb" role="25YQFr">
-      <node concept="12iwZl" id="3uwMEO1n1VN" role="1qenE9">
-        <property role="bVyBI" value="853525083" />
-        <node concept="12iwV3" id="3uwMEO1n1VO" role="12iwV8">
-          <property role="TrG5h" value="M" />
-          <node concept="12iSMG" id="3uwMEO1n1VR" role="12iwVe">
-            <property role="TrG5h" value="d" />
-            <node concept="12h7s0" id="3uwMEO1n1VU" role="12hoz8" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3clFbS" id="3uwMEO1mApg" role="LjaKd">
-      <node concept="2TK7Tu" id="3uwMEO1mAph" role="3cqZAp">
-        <property role="2TTd_B" value="[" />
-      </node>
-    </node>
-  </node>
 </model>
 

From cbf9d9aebf4270eff5605c22174e72e628503c3c Mon Sep 17 00:00:00 2001
From: Klaus Birken <klaus.birken@gmail.com>
Date: Tue, 30 Jun 2026 13:25:07 +0200
Subject: [PATCH 9/9] Fix shortcomings of old Change-To behavior and update
 CHANGELOG (#739).

---
 CHANGELOG.md                                  |   1 +
 ...riability.featuremodel.base.intentions.mps | 105 ++++++++++++++++++
 2 files changed, 106 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c70a52755..06562cf27b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ### Fixed
 
+- Variability: The editing of feature models in tree layout has been improved. E.g., typing ENTER on a feature will create a new sibling. Typing ":" in a feature's name will change it to a feature model include node. The intentions "Change to feature / feature model include" previously lost information about the feature, this is also fixed.
 - Variability: Fix workaround for using for-all-variants checking rules outside the IDE (e.g., on a build server). Due to MPS-34340, the for-all-variants checking cannot be done outside the IDE if the model under check has more than one root nodes. This bugfix includes roots of LogicalChildren in the list of used root nodes.
 - Physical units (language `org.iets3.core.expr.typetags.physunits`): Update unit in typesystem after prefix has been removed (e.g., from "cm" to "m").
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.intentions.mps
index 2f89fcd3f2..8f8d32f60f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.intentions.mps
@@ -460,6 +460,7 @@
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
+      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
       <concept id="5633809102336885303" name="jetbrains.mps.baseLanguage.collections.structure.SubListOperation" flags="nn" index="3b24QK">
@@ -1653,6 +1654,110 @@
             <node concept="2jxLKc" id="1DzhGouCE43" role="1tU5fm" />
           </node>
         </node>
+        <node concept="Jncv_" id="3FVFgnCeg5s" role="3cqZAp">
+          <ref role="JncvD" to="s6b7:3tsFshP5M5B" resolve="FeatureTreeNode" />
+          <node concept="37vLTw" id="3FVFgnCegjw" role="JncvB">
+            <ref role="3cqZAo" node="4HN4xf0U2Vu" resolve="newInstance" />
+          </node>
+          <node concept="3clFbS" id="3FVFgnCeg5w" role="Jncv$">
+            <node concept="3clFbF" id="3FVFgnCeDcP" role="3cqZAp">
+              <node concept="37vLTI" id="3FVFgnCeGXJ" role="3clFbG">
+                <node concept="2OqwBi" id="3FVFgnCeHjZ" role="37vLTx">
+                  <node concept="2Sf5sV" id="3FVFgnCeH3M" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="3FVFgnCeHny" role="2OqNvi">
+                    <ref role="3TsBF5" to="s6b7:3tsFshP62PQ" resolve="isMandatory" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="3FVFgnCeD$j" role="37vLTJ">
+                  <node concept="Jnkvi" id="3FVFgnCeDcN" role="2Oq$k0">
+                    <ref role="1M0zk5" node="3FVFgnCeg5y" resolve="newFTN" />
+                  </node>
+                  <node concept="3TrcHB" id="3FVFgnCeFCd" role="2OqNvi">
+                    <ref role="3TsBF5" to="s6b7:3tsFshP62PQ" resolve="isMandatory" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3FVFgnCeKpM" role="3cqZAp">
+              <node concept="37vLTI" id="3FVFgnCeNxS" role="3clFbG">
+                <node concept="2OqwBi" id="3FVFgnCeNSu" role="37vLTx">
+                  <node concept="2Sf5sV" id="3FVFgnCeNCh" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="3FVFgnCeNWN" role="2OqNvi">
+                    <ref role="3TsBF5" to="s6b7:59FNqAPCJNp" resolve="defaultState" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="3FVFgnCeKTv" role="37vLTJ">
+                  <node concept="Jnkvi" id="3FVFgnCeKpK" role="2Oq$k0">
+                    <ref role="1M0zk5" node="3FVFgnCeg5y" resolve="newFTN" />
+                  </node>
+                  <node concept="3TrcHB" id="3FVFgnCeLw9" role="2OqNvi">
+                    <ref role="3TsBF5" to="s6b7:59FNqAPCJNp" resolve="defaultState" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3FVFgnCeg_l" role="3cqZAp">
+              <node concept="37vLTI" id="3FVFgnCekW_" role="3clFbG">
+                <node concept="2OqwBi" id="3FVFgnCeldp" role="37vLTx">
+                  <node concept="2Sf5sV" id="3FVFgnCekXc" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3FVFgnCemlK" role="2OqNvi">
+                    <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="3FVFgnCegTX" role="37vLTJ">
+                  <node concept="Jnkvi" id="3FVFgnCeg_k" role="2Oq$k0">
+                    <ref role="1M0zk5" node="3FVFgnCeg5y" resolve="newFTN" />
+                  </node>
+                  <node concept="3TrEf2" id="3FVFgnCej2a" role="2OqNvi">
+                    <ref role="3Tt5mk" to="s6b7:3tsFshP6ikc" resolve="cardinality" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3FVFgnCeoZX" role="3cqZAp">
+              <node concept="2OqwBi" id="3FVFgnCeyg9" role="3clFbG">
+                <node concept="2OqwBi" id="3FVFgnCephm" role="2Oq$k0">
+                  <node concept="Jnkvi" id="3FVFgnCeoZV" role="2Oq$k0">
+                    <ref role="1M0zk5" node="3FVFgnCeg5y" resolve="newFTN" />
+                  </node>
+                  <node concept="3Tsc0h" id="3FVFgnCepSo" role="2OqNvi">
+                    <ref role="3TtcxE" to="s6b7:7Nu9WvXvID7" resolve="constraints" />
+                  </node>
+                </node>
+                <node concept="X8dFx" id="3FVFgnCe_Sv" role="2OqNvi">
+                  <node concept="2OqwBi" id="3FVFgnCeAUj" role="25WWJ7">
+                    <node concept="2Sf5sV" id="3FVFgnCeA16" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="3FVFgnCeBzH" role="2OqNvi">
+                      <ref role="3TtcxE" to="s6b7:7Nu9WvXvID7" resolve="constraints" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3FVFgnCeu0e" role="3cqZAp">
+              <node concept="37vLTI" id="3FVFgnCev0g" role="3clFbG">
+                <node concept="2OqwBi" id="3FVFgnCev4X" role="37vLTx">
+                  <node concept="2Sf5sV" id="3FVFgnCev1z" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3FVFgnCev72" role="2OqNvi">
+                    <ref role="3Tt5mk" to="s6b7:2PSWwRwtgYT" resolve="doc" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="3FVFgnCeum1" role="37vLTJ">
+                  <node concept="Jnkvi" id="3FVFgnCeu0c" role="2Oq$k0">
+                    <ref role="1M0zk5" node="3FVFgnCeg5y" resolve="newFTN" />
+                  </node>
+                  <node concept="3TrEf2" id="3FVFgnCeuOS" role="2OqNvi">
+                    <ref role="3Tt5mk" to="s6b7:2PSWwRwtgYT" resolve="doc" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="JncvC" id="3FVFgnCeg5y" role="JncvA">
+            <property role="TrG5h" value="newFTN" />
+            <node concept="2jxLKc" id="3FVFgnCeg5z" role="1tU5fm" />
+          </node>
+        </node>
         <node concept="3clFbF" id="4HN4xf0U2ZM" role="3cqZAp">
           <node concept="2OqwBi" id="4HN4xf0U37N" role="3clFbG">
             <node concept="2Sf5sV" id="4HN4xf0U2ZL" role="2Oq$k0" />