From f8083acb942d63c14cb6fc5d71b42c54c56049fc Mon Sep 17 00:00:00 2001
From: Torsten Goerg <tgoerg@itemis.de>
Date: Thu, 18 Dec 2025 04:25:45 +0100
Subject: [PATCH 1/2] Improve handling of root constraints in conjunction with
 grouping (#1552).

Details:
- Editor improvements for feature model root constraints.
- Added repositioning of feature model root constraints on constraint group assignment changes.
- Improved the the root constraints editor according to the review comments.
- Updated CHANGELOG.md.
---
 CHANGELOG.md                                  |    2 +
 ...3.variability.featuremodel.base.editor.mps | 1148 ++++++++++-------
 ...riability.featuremodel.base.intentions.mps |  758 +++++++++++
 ...rg.iets3.variability.featuremodel.base.mpl |    2 +
 .../org/iets3/opensource/build/build.mps      |    5 +
 5 files changed, 1432 insertions(+), 483 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7095f34d1d..1a4ebe51b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - Variability: Remove deprecated concepts `VariabilityModelChunk_old`, and some related concepts.
 - Typesystem: All usages of colon casts were transformed to the 'as' cast for null safety. From now on no colon casts are allowed in the typesystem, also read this issue for more info: https://github.com/IETS3/iets3.opensource/issues/688
+- Variability: The grouping of root constraints has been improved. New root constraints will be added next to the other constraints in the respective groups. This helps to avoid merge conflicts.
+
 
 ## November 2025
 
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 01d467ffd0..8e83e43ff2 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
@@ -59,6 +59,7 @@
     <import index="s7nz" ref="r:657b9157-a191-44db-93aa-6c27642f0f64(org.iets3.variability.base.editor)" />
     <import index="2rbz" ref="r:aeef8772-8af4-45c3-a762-623d4009d953(org.iets3.variability.base.plugin)" />
     <import index="mv1c" ref="r:ca6d049d-0cc6-4267-820c-178221dd0ad8(org.iets3.variability.configuration.base.editor)" />
+    <import index="hdhb" ref="r:07568eb8-30c0-4bb3-9dcb-50ee4b8de59a(jetbrains.mps.vcs.diff.ui.common)" />
     <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="1jcu" ref="r:729fa0c7-b4e4-42b1-acfe-71017c020a49(org.iets3.analysis.base.behavior)" implicit="true" />
@@ -963,37 +964,6 @@
         <node concept="2iRfu4" id="6JRy4xiNqVa" role="2iSdaV" />
       </node>
       <node concept="2iRkQZ" id="6JRy4xiNqU_" role="2iSdaV" />
-      <node concept="3EZMnI" id="6OwVbfosAiA" role="3EZMnx">
-        <node concept="2iRfu4" id="6OwVbfosAiB" role="2iSdaV" />
-        <node concept="3F0ifn" id="6OwVbfosAh_" role="3EZMnx">
-          <property role="3F0ifm" value="Grouping:" />
-        </node>
-        <node concept="1iCGBv" id="6OwVbfncXnO" role="3EZMnx">
-          <property role="1$x2rV" value="grouping" />
-          <ref role="1NtTu8" to="s6b7:6OwVbfncVTn" resolve="rootConstraintGrouping" />
-          <node concept="1sVBvm" id="6OwVbfncXnQ" role="1sWHZn">
-            <node concept="3F0A7n" id="6OwVbfncYfh" role="2wV5jI">
-              <property role="1Intyy" value="true" />
-              <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2T_mXK" id="1wPzUGtIFAQ" role="3EZMnx">
-        <node concept="2T_bXT" id="1wPzUGtIFAR" role="3F10Kt">
-          <property role="1lJzqY" value="2" />
-        </node>
-        <node concept="2T_bXS" id="4EirppPwJMP" role="3F10Kt">
-          <property role="Vb096" value="6cZGtrcKCoS/black" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="1wPzUGtIFAS" role="3EZMnx">
-        <property role="3F0ifm" value="Constraints:" />
-      </node>
-      <node concept="3F2HdR" id="1wPzUGtKLZB" role="3EZMnx">
-        <ref role="1NtTu8" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
-        <node concept="2iRkQZ" id="1wPzUGtKLZD" role="2czzBx" />
-      </node>
     </node>
     <node concept="3EZMnI" id="3tsFshP5EfL" role="2wV5jI">
       <node concept="2iRkQZ" id="3tsFshP5EfM" role="2iSdaV" />
@@ -1209,243 +1179,239 @@
           </node>
         </node>
       </node>
-      <node concept="3EZMnI" id="4L$vDwV2y4d" role="3EZMnx">
-        <node concept="VPM3Z" id="4L$vDwV2y4f" role="3F10Kt" />
-        <node concept="3uPbVW" id="4L$vDwV2VUv" role="3EZMnx">
-          <property role="3vr1H$" value="true" />
-          <property role="3vD9g8" value="true" />
-          <property role="3vvbre" value="true" />
-          <node concept="3EZMnI" id="6OwVbfncWQ2" role="3v1y6z">
-            <node concept="2iRfu4" id="6OwVbfncWQ3" role="2iSdaV" />
-            <node concept="1HlG4h" id="4L$vDwV2W8N" role="3EZMnx">
-              <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
-              <node concept="1HfYo3" id="4L$vDwV2W8P" role="1HlULh">
-                <node concept="3TQlhw" id="4L$vDwV2W8R" role="1Hhtcw">
-                  <node concept="3clFbS" id="4L$vDwV2W8T" role="2VODD2">
-                    <node concept="3cpWs8" id="6ca$HK86pLQ" role="3cqZAp">
-                      <node concept="3cpWsn" id="6ca$HK86pLR" role="3cpWs9">
-                        <property role="TrG5h" value="size" />
-                        <node concept="10Oyi0" id="6ca$HK7Hcek" role="1tU5fm" />
-                        <node concept="2OqwBi" id="6ca$HK86pLS" role="33vP2m">
-                          <node concept="2OqwBi" id="6ca$HK86pLT" role="2Oq$k0">
-                            <node concept="pncrf" id="6ca$HK86pLU" role="2Oq$k0" />
-                            <node concept="3Tsc0h" id="6ca$HK86pLV" role="2OqNvi">
-                              <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
-                            </node>
-                          </node>
-                          <node concept="34oBXx" id="6ca$HK86pLW" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbJ" id="1oH7qDLvQl6" role="3cqZAp">
-                      <node concept="3clFbS" id="1oH7qDLvQl8" role="3clFbx">
-                        <node concept="3cpWs6" id="1oH7qDLvRzI" role="3cqZAp">
-                          <node concept="Xl_RD" id="1oH7qDLvRKT" role="3cqZAk">
-                            <property role="Xl_RC" value="No Root Constraints" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2dkUwp" id="1oH7qDLvRmL" role="3clFbw">
-                        <node concept="3cmrfG" id="1oH7qDLvRx5" role="3uHU7w">
-                          <property role="3cmrfH" value="0" />
-                        </node>
-                        <node concept="37vLTw" id="1oH7qDLvQvG" role="3uHU7B">
-                          <ref role="3cqZAo" node="6ca$HK86pLR" resolve="size" />
-                        </node>
-                      </node>
+      <node concept="3EZMnI" id="2539ELgaxB4" role="3EZMnx">
+        <node concept="VPM3Z" id="2539ELgaxB6" role="3F10Kt" />
+        <node concept="1QoScp" id="2539ELgay8y" role="3EZMnx">
+          <property role="1QpmdY" value="true" />
+          <node concept="pkWqt" id="2539ELgay8_" role="3e4ffs">
+            <node concept="3clFbS" id="2539ELgay8B" role="2VODD2">
+              <node concept="3SKdUt" id="2539ELgaFE8" role="3cqZAp">
+                <node concept="1PaTwC" id="2539ELgaFE9" role="1aUNEU">
+                  <node concept="3oM_SD" id="2539ELgaFFO" role="1PaTwD">
+                    <property role="3oM_SC" value="Check" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFGe" role="1PaTwD">
+                    <property role="3oM_SC" value="if" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFGB" role="1PaTwD">
+                    <property role="3oM_SC" value="this" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFH1" role="1PaTwD">
+                    <property role="3oM_SC" value="concept" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFIq" role="1PaTwD">
+                    <property role="3oM_SC" value="editor" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFJM" role="1PaTwD">
+                    <property role="3oM_SC" value="is" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFKa" role="1PaTwD">
+                    <property role="3oM_SC" value="shown" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFLd" role="1PaTwD">
+                    <property role="3oM_SC" value="within" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFLX" role="1PaTwD">
+                    <property role="3oM_SC" value="a" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFMk" role="1PaTwD">
+                    <property role="3oM_SC" value="regular" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFNp" role="1PaTwD">
+                    <property role="3oM_SC" value="editor" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFNP" role="1PaTwD">
+                    <property role="3oM_SC" value="('true'" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFR_" role="1PaTwD">
+                    <property role="3oM_SC" value="branch)" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFRX" role="1PaTwD">
+                    <property role="3oM_SC" value="or" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFSD" role="1PaTwD">
+                    <property role="3oM_SC" value="within" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFTH" role="1PaTwD">
+                    <property role="3oM_SC" value="a" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFUo" role="1PaTwD">
+                    <property role="3oM_SC" value="diff" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFV6" role="1PaTwD">
+                    <property role="3oM_SC" value="view" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFVO" role="1PaTwD">
+                    <property role="3oM_SC" value="('false'" />
+                  </node>
+                  <node concept="3oM_SD" id="2539ELgaFXy" role="1PaTwD">
+                    <property role="3oM_SC" value="branch)." />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="2539ELgaDae" role="3cqZAp">
+                <node concept="3fqX7Q" id="2539ELgaDac" role="3clFbG">
+                  <node concept="2ZW3vV" id="2539ELgaFeP" role="3fr31v">
+                    <node concept="3uibUv" id="2539ELgaFnf" role="2ZW6by">
+                      <ref role="3uigEE" to="hdhb:42hl10VHay5" resolve="MainEditorComponent" />
                     </node>
-                    <node concept="3clFbF" id="6ca$HK86q2$" role="3cqZAp">
-                      <node concept="3cpWs3" id="6ca$HK86q2_" role="3clFbG">
-                        <node concept="3cpWs3" id="6ca$HK86q2A" role="3uHU7B">
-                          <node concept="37vLTw" id="6ca$HK86q2B" role="3uHU7B">
-                            <ref role="3cqZAo" node="6ca$HK86pLR" resolve="size" />
-                          </node>
-                          <node concept="Xl_RD" id="6ca$HK86q2C" role="3uHU7w">
-                            <property role="Xl_RC" value=" Root Constraint" />
-                          </node>
-                        </node>
-                        <node concept="1eOMI4" id="6ca$HK86q2D" role="3uHU7w">
-                          <node concept="3K4zz7" id="6ca$HK86q2E" role="1eOMHV">
-                            <node concept="Xl_RD" id="6ca$HK86q2F" role="3K4E3e">
-                              <property role="Xl_RC" value="" />
-                            </node>
-                            <node concept="Xl_RD" id="6ca$HK86q2G" role="3K4GZi">
-                              <property role="Xl_RC" value="s" />
-                            </node>
-                            <node concept="2dkUwp" id="6ca$HK8acZs" role="3K4Cdx">
-                              <node concept="37vLTw" id="6ca$HK86q2J" role="3uHU7B">
-                                <ref role="3cqZAo" node="6ca$HK86pLR" resolve="size" />
-                              </node>
-                              <node concept="3cmrfG" id="6ca$HK86q2I" role="3uHU7w">
-                                <property role="3cmrfH" value="1" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
+                    <node concept="2OqwBi" id="2539ELgaDHj" role="2ZW6bz">
+                      <node concept="1Q80Hx" id="2539ELgaDo2" role="2Oq$k0" />
+                      <node concept="liA8E" id="2539ELgaEoY" role="2OqNvi">
+                        <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3F0ifn" id="6OwVbfoB$fu" role="3EZMnx">
-              <property role="3F0ifm" value="with grouping" />
-              <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
-              <node concept="VPM3Z" id="6OwVbfoDONI" role="3F10Kt" />
-            </node>
-            <node concept="1iCGBv" id="6OwVbfoBzSJ" role="3EZMnx">
-              <property role="1$x2rV" value="none" />
-              <ref role="1NtTu8" to="s6b7:6OwVbfncVTn" resolve="rootConstraintGrouping" />
-              <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
-              <node concept="1sVBvm" id="6OwVbfoBzSL" role="1sWHZn">
-                <node concept="3F0A7n" id="6OwVbfoBzWQ" role="2wV5jI">
-                  <property role="1Intyy" value="true" />
-                  <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-                </node>
-              </node>
-            </node>
           </node>
-          <node concept="3EZMnI" id="6OwVbfnAoAf" role="3v87hO">
-            <node concept="s8t4o" id="6OwVbfnAoD7" role="3EZMnx">
-              <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
-              <ref role="28F8cf" to="s6b7:6OwVbfncU9A" resolve="ConstraintGroup" />
-              <node concept="s8sZD" id="6OwVbfnAoDa" role="sbcd9">
-                <node concept="3clFbS" id="6OwVbfnAoDb" role="2VODD2">
-                  <node concept="3cpWs8" id="1BW0KPic_io" role="3cqZAp">
-                    <node concept="3cpWsn" id="1BW0KPic_ip" role="3cpWs9">
-                      <property role="TrG5h" value="group2ConstraintEntry" />
-                      <node concept="2hMVRd" id="1BW0KPic_iq" role="1tU5fm">
-                        <node concept="3uibUv" id="1BW0KPic_ir" role="2hN53Y">
-                          <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Map.Entry" />
-                          <node concept="3Tqbb2" id="1BW0KPic_is" role="11_B2D">
-                            <ref role="ehGHo" to="s6b7:6OwVbfncU9A" resolve="ConstraintGroup" />
-                          </node>
-                          <node concept="3uibUv" id="1BW0KPic_it" role="11_B2D">
-                            <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-                            <node concept="3Tqbb2" id="1BW0KPic_iu" role="11_B2D">
-                              <ref role="ehGHo" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+          <node concept="3uPbVW" id="4L$vDwV2VUv" role="1QoS34">
+            <property role="3vr1H$" value="true" />
+            <property role="3vD9g8" value="true" />
+            <property role="3vvbre" value="true" />
+            <node concept="3EZMnI" id="6OwVbfnAoAf" role="3v87hO">
+              <node concept="s8t4o" id="6OwVbfnAoD7" role="3EZMnx">
+                <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
+                <ref role="28F8cf" to="s6b7:6OwVbfncU9A" resolve="ConstraintGroup" />
+                <node concept="s8sZD" id="6OwVbfnAoDa" role="sbcd9">
+                  <node concept="3clFbS" id="6OwVbfnAoDb" role="2VODD2">
+                    <node concept="3cpWs8" id="1BW0KPic_io" role="3cqZAp">
+                      <node concept="3cpWsn" id="1BW0KPic_ip" role="3cpWs9">
+                        <property role="TrG5h" value="group2ConstraintEntry" />
+                        <node concept="2hMVRd" id="1BW0KPic_iq" role="1tU5fm">
+                          <node concept="3uibUv" id="1BW0KPic_ir" role="2hN53Y">
+                            <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Entry" />
+                            <node concept="3Tqbb2" id="1BW0KPic_is" role="11_B2D">
+                              <ref role="ehGHo" to="s6b7:6OwVbfncU9A" resolve="ConstraintGroup" />
+                            </node>
+                            <node concept="3uibUv" id="1BW0KPic_it" role="11_B2D">
+                              <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+                              <node concept="3Tqbb2" id="1BW0KPic_iu" role="11_B2D">
+                                <ref role="ehGHo" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+                              </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="2YIFZM" id="1BW0KPic_iv" role="33vP2m">
-                        <ref role="1Pybhc" node="6OwVbfnTAQE" resolve="ConstraintsHelper" />
-                        <ref role="37wK5l" node="1BW0KPi4uQI" resolve="group2Constraints" />
-                        <node concept="2OqwBi" id="1BW0KPic_iw" role="37wK5m">
-                          <node concept="pncrf" id="1BW0KPic_ix" role="2Oq$k0" />
-                          <node concept="3Tsc0h" id="1BW0KPicAUN" role="2OqNvi">
-                            <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
+                        <node concept="2YIFZM" id="1BW0KPic_iv" role="33vP2m">
+                          <ref role="1Pybhc" node="6OwVbfnTAQE" resolve="ConstraintsHelper" />
+                          <ref role="37wK5l" node="1BW0KPi4uQI" resolve="group2Constraints" />
+                          <node concept="2OqwBi" id="1BW0KPic_iw" role="37wK5m">
+                            <node concept="pncrf" id="1BW0KPic_ix" role="2Oq$k0" />
+                            <node concept="3Tsc0h" id="1BW0KPicAUN" role="2OqNvi">
+                              <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" />
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="3clFbH" id="1BW0KPic_iz" role="3cqZAp" />
-                  <node concept="3clFbF" id="1BW0KPic_i$" role="3cqZAp">
-                    <node concept="2YIFZM" id="1BW0KPic_i_" role="3clFbG">
-                      <ref role="37wK5l" node="1BW0KPi4zvY" resolve="attachConstraintsToGroup" />
-                      <ref role="1Pybhc" node="6OwVbfnTAQE" resolve="ConstraintsHelper" />
-                      <node concept="37vLTw" id="1BW0KPic_iA" role="37wK5m">
-                        <ref role="3cqZAo" node="1BW0KPic_ip" resolve="group2ConstraintEntry" />
+                    <node concept="3clFbH" id="1BW0KPic_iz" role="3cqZAp" />
+                    <node concept="3clFbF" id="1BW0KPic_i$" role="3cqZAp">
+                      <node concept="2YIFZM" id="1BW0KPic_i_" role="3clFbG">
+                        <ref role="37wK5l" node="1BW0KPi4zvY" resolve="attachConstraintsToGroup" />
+                        <ref role="1Pybhc" node="6OwVbfnTAQE" resolve="ConstraintsHelper" />
+                        <node concept="37vLTw" id="1BW0KPic_iA" role="37wK5m">
+                          <ref role="3cqZAo" node="1BW0KPic_ip" resolve="group2ConstraintEntry" />
+                        </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="3clFbF" id="1BW0KPic_iB" role="3cqZAp">
-                    <node concept="2OqwBi" id="1BW0KPic_iC" role="3clFbG">
-                      <node concept="37vLTw" id="1BW0KPic_iD" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1BW0KPic_ip" resolve="group2ConstraintEntry" />
-                      </node>
-                      <node concept="3$u5V9" id="1BW0KPic_iE" role="2OqNvi">
-                        <node concept="1bVj0M" id="1BW0KPic_iF" role="23t8la">
-                          <node concept="3clFbS" id="1BW0KPic_iG" role="1bW5cS">
-                            <node concept="3clFbF" id="1BW0KPic_iH" role="3cqZAp">
-                              <node concept="2OqwBi" id="1BW0KPic_iI" role="3clFbG">
-                                <node concept="37vLTw" id="1BW0KPic_iJ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2r1kIC$yAnC" resolve="it" />
-                                </node>
-                                <node concept="liA8E" id="1BW0KPic_iK" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~Map$Entry.getKey()" resolve="getKey" />
+                    <node concept="3clFbF" id="1BW0KPic_iB" role="3cqZAp">
+                      <node concept="2OqwBi" id="1BW0KPic_iC" role="3clFbG">
+                        <node concept="37vLTw" id="1BW0KPic_iD" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1BW0KPic_ip" resolve="group2ConstraintEntry" />
+                        </node>
+                        <node concept="3$u5V9" id="1BW0KPic_iE" role="2OqNvi">
+                          <node concept="1bVj0M" id="1BW0KPic_iF" role="23t8la">
+                            <node concept="3clFbS" id="1BW0KPic_iG" role="1bW5cS">
+                              <node concept="3clFbF" id="1BW0KPic_iH" role="3cqZAp">
+                                <node concept="2OqwBi" id="1BW0KPic_iI" role="3clFbG">
+                                  <node concept="37vLTw" id="1BW0KPic_iJ" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="2r1kIC$yAnC" resolve="it" />
+                                  </node>
+                                  <node concept="liA8E" id="1BW0KPic_iK" role="2OqNvi">
+                                    <ref role="37wK5l" to="33ny:~Map$Entry.getKey()" resolve="getKey" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
-                          </node>
-                          <node concept="gl6BB" id="2r1kIC$yAnC" role="1bW2Oz">
-                            <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2r1kIC$yAnD" role="1tU5fm" />
+                            <node concept="gl6BB" id="2r1kIC$yAnC" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="2r1kIC$yAnD" role="1tU5fm" />
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-              <node concept="1yz3lS" id="6OwVbfnABwP" role="1yzFaX">
-                <node concept="3uPbVW" id="6OwVbfnABSH" role="2wV5jI">
-                  <property role="3vr1H$" value="true" />
-                  <property role="3vvbre" value="true" />
-                  <property role="3vD9g8" value="true" />
-                  <node concept="s8t4o" id="6OwVbfnAC3O" role="3v87hO">
-                    <ref role="28F8cf" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
-                    <node concept="s8sZD" id="6OwVbfnAC3R" role="sbcd9">
-                      <node concept="3clFbS" id="6OwVbfnAC3S" role="2VODD2">
-                        <node concept="3clFbF" id="6OwVbfnTTDJ" role="3cqZAp">
-                          <node concept="10QFUN" id="1BW0KPicH$k" role="3clFbG">
-                            <node concept="A3Dl8" id="1BW0KPicH$l" role="10QFUM">
-                              <node concept="3Tqbb2" id="1BW0KPicH$m" role="A3Ik2">
-                                <ref role="ehGHo" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+                <node concept="1yz3lS" id="6OwVbfnABwP" role="1yzFaX">
+                  <node concept="3uPbVW" id="6OwVbfnABSH" role="2wV5jI">
+                    <property role="3vr1H$" value="true" />
+                    <property role="3vvbre" value="true" />
+                    <property role="3vD9g8" value="true" />
+                    <node concept="s8t4o" id="6OwVbfnAC3O" role="3v87hO">
+                      <ref role="28F8cf" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+                      <node concept="s8sZD" id="6OwVbfnAC3R" role="sbcd9">
+                        <node concept="3clFbS" id="6OwVbfnAC3S" role="2VODD2">
+                          <node concept="3clFbF" id="6OwVbfnTTDJ" role="3cqZAp">
+                            <node concept="10QFUN" id="1BW0KPicH$k" role="3clFbG">
+                              <node concept="A3Dl8" id="1BW0KPicH$l" role="10QFUM">
+                                <node concept="3Tqbb2" id="1BW0KPicH$m" role="A3Ik2">
+                                  <ref role="ehGHo" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+                                </node>
+                              </node>
+                              <node concept="2YIFZM" id="1BW0KPicH$n" role="10QFUP">
+                                <ref role="37wK5l" node="1BW0KPi56Vd" resolve="constraintsOf" />
+                                <ref role="1Pybhc" node="6OwVbfnTAQE" resolve="ConstraintsHelper" />
+                                <node concept="pncrf" id="1BW0KPicH$o" role="37wK5m" />
                               </node>
-                            </node>
-                            <node concept="2YIFZM" id="1BW0KPicH$n" role="10QFUP">
-                              <ref role="37wK5l" node="1BW0KPi56Vd" resolve="constraintsOf" />
-                              <ref role="1Pybhc" node="6OwVbfnTAQE" resolve="ConstraintsHelper" />
-                              <node concept="pncrf" id="1BW0KPicH$o" role="37wK5m" />
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="1yz3lS" id="6OwVbfnB6Tt" role="1yzFaX">
-                      <node concept="3EZMnI" id="6OwVbfnNEG0" role="2wV5jI">
-                        <node concept="2iRkQZ" id="6OwVbfnNEG1" role="2iSdaV" />
-                        <node concept="3EZMnI" id="35s7LtisUU0" role="3EZMnx">
-                          <node concept="2iRfu4" id="35s7LtisUU1" role="2iSdaV" />
-                          <node concept="2up9LE" id="2KPm2gwXpd4" role="3EZMnx">
-                            <node concept="2ur3mg" id="2KPm2gwXpoB" role="3F10Kt">
-                              <property role="1lJzqY" value="3" />
-                            </node>
-                            <node concept="2ur1lV" id="2KPm2gwXpoG" role="3F10Kt">
-                              <node concept="3ZlJ5R" id="2KPm2gwXpoK" role="VblUZ">
-                                <node concept="3clFbS" id="2KPm2gwXpoL" role="2VODD2">
-                                  <node concept="3cpWs8" id="2KPm2gwXNT4" role="3cqZAp">
-                                    <node concept="3cpWsn" id="2KPm2gwXNT5" role="3cpWs9">
-                                      <property role="TrG5h" value="color" />
-                                      <node concept="3uibUv" id="2KPm2gwXNKx" role="1tU5fm">
-                                        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-                                      </node>
-                                      <node concept="2OqwBi" id="2KPm2gwXNT6" role="33vP2m">
-                                        <node concept="2OqwBi" id="2KPm2gwXNT7" role="2Oq$k0">
-                                          <node concept="pncrf" id="2KPm2gwXNT8" role="2Oq$k0" />
-                                          <node concept="3CFZ6_" id="2KPm2gwXNT9" role="2OqNvi">
-                                            <node concept="3CFYIy" id="2KPm2gwXNTa" role="3CFYIz">
-                                              <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                      <node concept="1yz3lS" id="6OwVbfnB6Tt" role="1yzFaX">
+                        <node concept="3EZMnI" id="6OwVbfnNEG0" role="2wV5jI">
+                          <node concept="2iRkQZ" id="6OwVbfnNEG1" role="2iSdaV" />
+                          <node concept="3EZMnI" id="35s7LtisUU0" role="3EZMnx">
+                            <node concept="2iRfu4" id="35s7LtisUU1" role="2iSdaV" />
+                            <node concept="2up9LE" id="2KPm2gwXpd4" role="3EZMnx">
+                              <node concept="2ur3mg" id="2KPm2gwXpoB" role="3F10Kt">
+                                <property role="1lJzqY" value="3" />
+                              </node>
+                              <node concept="2ur1lV" id="2KPm2gwXpoG" role="3F10Kt">
+                                <node concept="3ZlJ5R" id="2KPm2gwXpoK" role="VblUZ">
+                                  <node concept="3clFbS" id="2KPm2gwXpoL" role="2VODD2">
+                                    <node concept="3cpWs8" id="2KPm2gwXNT4" role="3cqZAp">
+                                      <node concept="3cpWsn" id="2KPm2gwXNT5" role="3cpWs9">
+                                        <property role="TrG5h" value="color" />
+                                        <node concept="3uibUv" id="2KPm2gwXNKx" role="1tU5fm">
+                                          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+                                        </node>
+                                        <node concept="2OqwBi" id="2KPm2gwXNT6" role="33vP2m">
+                                          <node concept="2OqwBi" id="2KPm2gwXNT7" role="2Oq$k0">
+                                            <node concept="pncrf" id="2KPm2gwXNT8" role="2Oq$k0" />
+                                            <node concept="3CFZ6_" id="2KPm2gwXNT9" role="2OqNvi">
+                                              <node concept="3CFYIy" id="2KPm2gwXNTa" role="3CFYIz">
+                                                <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                                              </node>
                                             </node>
                                           </node>
-                                        </node>
-                                        <node concept="2qgKlT" id="2KPm2gwXNTb" role="2OqNvi">
-                                          <ref role="37wK5l" to="zccc:6OwVbfnTUjE" resolve="getColor" />
+                                          <node concept="2qgKlT" id="2KPm2gwXNTb" role="2OqNvi">
+                                            <ref role="37wK5l" to="zccc:6OwVbfnTUjE" resolve="getColor" />
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
-                                  </node>
-                                  <node concept="3clFbF" id="2KPm2gwXqGJ" role="3cqZAp">
-                                    <node concept="2ShNRf" id="2KPm2gwXqGH" role="3clFbG">
-                                      <node concept="1pGfFk" id="2KPm2gwXNAu" role="2ShVmc">
-                                        <ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
-                                        <node concept="37vLTw" id="2KPm2gwXO7s" role="37wK5m">
-                                          <ref role="3cqZAo" node="2KPm2gwXNT5" resolve="color" />
-                                        </node>
-                                        <node concept="37vLTw" id="2KPm2gwXSZl" role="37wK5m">
-                                          <ref role="3cqZAo" node="2KPm2gwXNT5" resolve="color" />
+                                    <node concept="3clFbF" id="2KPm2gwXqGJ" role="3cqZAp">
+                                      <node concept="2ShNRf" id="2KPm2gwXqGH" role="3clFbG">
+                                        <node concept="1pGfFk" id="2KPm2gwXNAu" role="2ShVmc">
+                                          <ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
+                                          <node concept="37vLTw" id="2KPm2gwXO7s" role="37wK5m">
+                                            <ref role="3cqZAo" node="2KPm2gwXNT5" resolve="color" />
+                                          </node>
+                                          <node concept="37vLTw" id="2KPm2gwXSZl" role="37wK5m">
+                                            <ref role="3cqZAo" node="2KPm2gwXNT5" resolve="color" />
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -1453,92 +1419,92 @@
                                 </node>
                               </node>
                             </node>
-                          </node>
-                          <node concept="r$x8Z" id="6OwVbfnB6Yz" role="3EZMnx">
-                            <node concept="VPM3Z" id="5sXsnEdxwNM" role="3F10Kt" />
+                            <node concept="r$x8Z" id="6OwVbfnB6Yz" role="3EZMnx">
+                              <node concept="VPM3Z" id="5sXsnEdxwNM" role="3F10Kt" />
+                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="2iRkQZ" id="6OwVbfnJ25e" role="2czzBy" />
-                    <node concept="AVF6i" id="5sXsnEd5wkF" role="2daAY1">
-                      <node concept="3clFbS" id="5sXsnEd5wkG" role="2VODD2">
-                        <node concept="3clFbF" id="5sXsnEd5won" role="3cqZAp">
-                          <node concept="2OqwBi" id="5sXsnEd5wvl" role="3clFbG">
-                            <node concept="2dRY2x" id="5sXsnEd5wom" role="2Oq$k0" />
-                            <node concept="3YRAZt" id="5sXsnEd5wFi" role="2OqNvi" />
+                      <node concept="2iRkQZ" id="6OwVbfnJ25e" role="2czzBy" />
+                      <node concept="AVF6i" id="5sXsnEd5wkF" role="2daAY1">
+                        <node concept="3clFbS" id="5sXsnEd5wkG" role="2VODD2">
+                          <node concept="3clFbF" id="5sXsnEd5won" role="3cqZAp">
+                            <node concept="2OqwBi" id="5sXsnEd5wvl" role="3clFbG">
+                              <node concept="2dRY2x" id="5sXsnEd5wom" role="2Oq$k0" />
+                              <node concept="3YRAZt" id="5sXsnEd5wFi" role="2OqNvi" />
+                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="ARxKT" id="5sXsnEdEgIH" role="AS3tk">
-                      <node concept="3clFbS" id="5sXsnEdEgII" role="2VODD2">
-                        <node concept="3cpWs8" id="5sXsnEdCazf" role="3cqZAp">
-                          <node concept="3cpWsn" id="5sXsnEdCazi" role="3cpWs9">
-                            <property role="TrG5h" value="anchorConstraint" />
-                            <node concept="3Tqbb2" id="5sXsnEdCazd" role="1tU5fm">
-                              <ref role="ehGHo" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
-                            </node>
-                            <node concept="1PxgMI" id="5sXsnEdCaGC" role="33vP2m">
-                              <property role="1BlNFB" value="true" />
-                              <node concept="chp4Y" id="5sXsnEdCaHk" role="3oSUPX">
-                                <ref role="cht4Q" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+                      <node concept="ARxKT" id="5sXsnEdEgIH" role="AS3tk">
+                        <node concept="3clFbS" id="5sXsnEdEgII" role="2VODD2">
+                          <node concept="3cpWs8" id="5sXsnEdCazf" role="3cqZAp">
+                            <node concept="3cpWsn" id="5sXsnEdCazi" role="3cpWs9">
+                              <property role="TrG5h" value="anchorConstraint" />
+                              <node concept="3Tqbb2" id="5sXsnEdCazd" role="1tU5fm">
+                                <ref role="ehGHo" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
                               </node>
-                              <node concept="AS6u$" id="5sXsnEdCa_q" role="1m5AlR" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3cpWs8" id="5sXsnEdBwfa" role="3cqZAp">
-                          <node concept="3cpWsn" id="5sXsnEdBwfd" role="3cpWs9">
-                            <property role="TrG5h" value="newConstraint" />
-                            <node concept="3Tqbb2" id="5sXsnEdBwf8" role="1tU5fm">
-                              <ref role="ehGHo" to="s6b7:7Nu9WvXvIDd" resolve="ExpressionConstraint" />
-                            </node>
-                            <node concept="2ShNRf" id="5sXsnEdBwh1" role="33vP2m">
-                              <node concept="2fJWfE" id="5sXsnEdC7u0" role="2ShVmc">
-                                <node concept="3Tqbb2" id="5sXsnEdC7u2" role="3zrR0E">
-                                  <ref role="ehGHo" to="s6b7:7Nu9WvXvIDd" resolve="ExpressionConstraint" />
+                              <node concept="1PxgMI" id="5sXsnEdCaGC" role="33vP2m">
+                                <property role="1BlNFB" value="true" />
+                                <node concept="chp4Y" id="5sXsnEdCaHk" role="3oSUPX">
+                                  <ref role="cht4Q" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
                                 </node>
+                                <node concept="AS6u$" id="5sXsnEdCa_q" role="1m5AlR" />
                               </node>
                             </node>
                           </node>
-                        </node>
-                        <node concept="3clFbF" id="5sXsnEdC7vd" role="3cqZAp">
-                          <node concept="2OqwBi" id="5sXsnEdC89$" role="3clFbG">
-                            <node concept="2OqwBi" id="5sXsnEdC7CU" role="2Oq$k0">
-                              <node concept="37vLTw" id="5sXsnEdC7vb" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5sXsnEdBwfd" resolve="newConstraint" />
+                          <node concept="3cpWs8" id="5sXsnEdBwfa" role="3cqZAp">
+                            <node concept="3cpWsn" id="5sXsnEdBwfd" role="3cpWs9">
+                              <property role="TrG5h" value="newConstraint" />
+                              <node concept="3Tqbb2" id="5sXsnEdBwf8" role="1tU5fm">
+                                <ref role="ehGHo" to="s6b7:7Nu9WvXvIDd" resolve="ExpressionConstraint" />
                               </node>
-                              <node concept="3CFZ6_" id="5sXsnEdC7Ud" role="2OqNvi">
-                                <node concept="3CFYIy" id="5sXsnEdC7YA" role="3CFYIz">
-                                  <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                              <node concept="2ShNRf" id="5sXsnEdBwh1" role="33vP2m">
+                                <node concept="2fJWfE" id="5sXsnEdC7u0" role="2ShVmc">
+                                  <node concept="3Tqbb2" id="5sXsnEdC7u2" role="3zrR0E">
+                                    <ref role="ehGHo" to="s6b7:7Nu9WvXvIDd" resolve="ExpressionConstraint" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="2oxUTD" id="5sXsnEdC8Sh" role="2OqNvi">
-                              <node concept="2pJPEk" id="5sXsnEdC8VY" role="2oxUTC">
-                                <node concept="2pJPED" id="5sXsnEdC8W0" role="2pJPEn">
-                                  <ref role="2pJxaS" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
-                                  <node concept="2pIpSj" id="5sXsnEdCasT" role="2pJxcM">
-                                    <ref role="2pIpSl" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
-                                    <node concept="36biLy" id="5sXsnEdCaLK" role="28nt2d">
-                                      <node concept="2OqwBi" id="5sXsnEdCcbK" role="36biLW">
-                                        <node concept="2OqwBi" id="5sXsnEdCbQc" role="2Oq$k0">
-                                          <node concept="2OqwBi" id="5sXsnEdCbre" role="2Oq$k0">
-                                            <node concept="37vLTw" id="5sXsnEdCaOf" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="5sXsnEdCazi" resolve="anchorConstraint" />
-                                            </node>
-                                            <node concept="3CFZ6_" id="5sXsnEdCbCo" role="2OqNvi">
-                                              <node concept="3CFYIy" id="5sXsnEdCbF0" role="3CFYIz">
-                                                <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                          </node>
+                          <node concept="3clFbF" id="5sXsnEdC7vd" role="3cqZAp">
+                            <node concept="2OqwBi" id="5sXsnEdC89$" role="3clFbG">
+                              <node concept="2OqwBi" id="5sXsnEdC7CU" role="2Oq$k0">
+                                <node concept="37vLTw" id="5sXsnEdC7vb" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5sXsnEdBwfd" resolve="newConstraint" />
+                                </node>
+                                <node concept="3CFZ6_" id="5sXsnEdC7Ud" role="2OqNvi">
+                                  <node concept="3CFYIy" id="5sXsnEdC7YA" role="3CFYIz">
+                                    <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="2oxUTD" id="5sXsnEdC8Sh" role="2OqNvi">
+                                <node concept="2pJPEk" id="5sXsnEdC8VY" role="2oxUTC">
+                                  <node concept="2pJPED" id="5sXsnEdC8W0" role="2pJPEn">
+                                    <ref role="2pJxaS" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                                    <node concept="2pIpSj" id="5sXsnEdCasT" role="2pJxcM">
+                                      <ref role="2pIpSl" to="s6b7:6OwVbfnqiC9" />
+                                      <node concept="36biLy" id="5sXsnEdCaLK" role="28nt2d">
+                                        <node concept="2OqwBi" id="5sXsnEdCcbK" role="36biLW">
+                                          <node concept="2OqwBi" id="5sXsnEdCbQc" role="2Oq$k0">
+                                            <node concept="2OqwBi" id="5sXsnEdCbre" role="2Oq$k0">
+                                              <node concept="37vLTw" id="5sXsnEdCaOf" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="5sXsnEdCazi" resolve="anchorConstraint" />
+                                              </node>
+                                              <node concept="3CFZ6_" id="5sXsnEdCbCo" role="2OqNvi">
+                                                <node concept="3CFYIy" id="5sXsnEdCbF0" role="3CFYIz">
+                                                  <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                                                </node>
                                               </node>
                                             </node>
+                                            <node concept="3TrEf2" id="5sXsnEdCbWk" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
+                                            </node>
                                           </node>
-                                          <node concept="3TrEf2" id="5sXsnEdCbWk" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
-                                          </node>
+                                          <node concept="1$rogu" id="5sXsnEdCcup" role="2OqNvi" />
                                         </node>
-                                        <node concept="1$rogu" id="5sXsnEdCcup" role="2OqNvi" />
                                       </node>
                                     </node>
                                   </node>
@@ -1546,33 +1512,33 @@
                               </node>
                             </node>
                           </node>
-                        </node>
-                        <node concept="3clFbJ" id="5sXsnEdBvGv" role="3cqZAp">
-                          <node concept="3clFbS" id="5sXsnEdBvGx" role="3clFbx">
-                            <node concept="3clFbF" id="5sXsnEdBvS5" role="3cqZAp">
-                              <node concept="2OqwBi" id="5sXsnEdBvZ3" role="3clFbG">
-                                <node concept="37vLTw" id="5sXsnEdCcyU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5sXsnEdCazi" resolve="anchorConstraint" />
-                                </node>
-                                <node concept="HtX7F" id="5sXsnEdBwcE" role="2OqNvi">
-                                  <node concept="37vLTw" id="5sXsnEdCcAx" role="HtX7I">
-                                    <ref role="3cqZAo" node="5sXsnEdBwfd" resolve="newConstraint" />
+                          <node concept="3clFbJ" id="5sXsnEdBvGv" role="3cqZAp">
+                            <node concept="3clFbS" id="5sXsnEdBvGx" role="3clFbx">
+                              <node concept="3clFbF" id="5sXsnEdBvS5" role="3cqZAp">
+                                <node concept="2OqwBi" id="5sXsnEdBvZ3" role="3clFbG">
+                                  <node concept="37vLTw" id="5sXsnEdCcyU" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="5sXsnEdCazi" resolve="anchorConstraint" />
+                                  </node>
+                                  <node concept="HtX7F" id="5sXsnEdBwcE" role="2OqNvi">
+                                    <node concept="37vLTw" id="5sXsnEdCcAx" role="HtX7I">
+                                      <ref role="3cqZAo" node="5sXsnEdBwfd" resolve="newConstraint" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                          </node>
-                          <node concept="AVj8N" id="5sXsnEdBvNG" role="3clFbw" />
-                          <node concept="9aQIb" id="5sXsnEdCcBd" role="9aQIa">
-                            <node concept="3clFbS" id="5sXsnEdCcBe" role="9aQI4">
-                              <node concept="3clFbF" id="5sXsnEdCcBI" role="3cqZAp">
-                                <node concept="2OqwBi" id="5sXsnEdCcJx" role="3clFbG">
-                                  <node concept="37vLTw" id="5sXsnEdCcBH" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5sXsnEdCazi" resolve="anchorConstraint" />
-                                  </node>
-                                  <node concept="HtI8k" id="5sXsnEdCcYV" role="2OqNvi">
-                                    <node concept="37vLTw" id="5sXsnEdCd19" role="HtI8F">
-                                      <ref role="3cqZAo" node="5sXsnEdBwfd" resolve="newConstraint" />
+                            <node concept="AVj8N" id="5sXsnEdBvNG" role="3clFbw" />
+                            <node concept="9aQIb" id="5sXsnEdCcBd" role="9aQIa">
+                              <node concept="3clFbS" id="5sXsnEdCcBe" role="9aQI4">
+                                <node concept="3clFbF" id="5sXsnEdCcBI" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5sXsnEdCcJx" role="3clFbG">
+                                    <node concept="37vLTw" id="5sXsnEdCcBH" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5sXsnEdCazi" resolve="anchorConstraint" />
+                                    </node>
+                                    <node concept="HtI8k" id="5sXsnEdCcYV" role="2OqNvi">
+                                      <node concept="37vLTw" id="5sXsnEdCd19" role="HtI8F">
+                                        <ref role="3cqZAo" node="5sXsnEdBwfd" resolve="newConstraint" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -1582,41 +1548,41 @@
                         </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="3EZMnI" id="6OwVbfo7hqq" role="3v1y6z">
-                    <node concept="2iRkQZ" id="6OwVbfo7hqr" role="2iSdaV" />
-                    <node concept="3EZMnI" id="5neqlgbRoYN" role="3EZMnx">
-                      <node concept="2iRfu4" id="5neqlgbRoYO" role="2iSdaV" />
-                      <node concept="2up9LE" id="2KPm2gx0s9v" role="3EZMnx">
-                        <node concept="2ur3mg" id="2KPm2gx0sim" role="3F10Kt">
-                          <property role="1lJzqY" value="3" />
-                        </node>
-                        <node concept="2ur1lV" id="2KPm2gx0sir" role="3F10Kt">
-                          <node concept="3ZlJ5R" id="2KPm2gx0siv" role="VblUZ">
-                            <node concept="3clFbS" id="2KPm2gx0siw" role="2VODD2">
-                              <node concept="3cpWs8" id="2KPm2gx0sY3" role="3cqZAp">
-                                <node concept="3cpWsn" id="2KPm2gx0sY4" role="3cpWs9">
-                                  <property role="TrG5h" value="color" />
-                                  <node concept="3uibUv" id="2KPm2gx0sTq" role="1tU5fm">
-                                    <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-                                  </node>
-                                  <node concept="2OqwBi" id="2KPm2gx0sY5" role="33vP2m">
-                                    <node concept="pncrf" id="2KPm2gx0sY6" role="2Oq$k0" />
-                                    <node concept="2qgKlT" id="2KPm2gx0sY7" role="2OqNvi">
-                                      <ref role="37wK5l" to="zccc:6OwVbfnk$cR" resolve="getColor" />
+                    <node concept="3EZMnI" id="6OwVbfo7hqq" role="3v1y6z">
+                      <node concept="2iRkQZ" id="6OwVbfo7hqr" role="2iSdaV" />
+                      <node concept="3EZMnI" id="5neqlgbRoYN" role="3EZMnx">
+                        <node concept="2iRfu4" id="5neqlgbRoYO" role="2iSdaV" />
+                        <node concept="2up9LE" id="2KPm2gx0s9v" role="3EZMnx">
+                          <node concept="2ur3mg" id="2KPm2gx0sim" role="3F10Kt">
+                            <property role="1lJzqY" value="3" />
+                          </node>
+                          <node concept="2ur1lV" id="2KPm2gx0sir" role="3F10Kt">
+                            <node concept="3ZlJ5R" id="2KPm2gx0siv" role="VblUZ">
+                              <node concept="3clFbS" id="2KPm2gx0siw" role="2VODD2">
+                                <node concept="3cpWs8" id="2KPm2gx0sY3" role="3cqZAp">
+                                  <node concept="3cpWsn" id="2KPm2gx0sY4" role="3cpWs9">
+                                    <property role="TrG5h" value="color" />
+                                    <node concept="3uibUv" id="2KPm2gx0sTq" role="1tU5fm">
+                                      <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+                                    </node>
+                                    <node concept="2OqwBi" id="2KPm2gx0sY5" role="33vP2m">
+                                      <node concept="pncrf" id="2KPm2gx0sY6" role="2Oq$k0" />
+                                      <node concept="2qgKlT" id="2KPm2gx0sY7" role="2OqNvi">
+                                        <ref role="37wK5l" to="zccc:6OwVbfnk$cR" resolve="getColor" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
-                              </node>
-                              <node concept="3clFbF" id="2KPm2gx0t0q" role="3cqZAp">
-                                <node concept="2ShNRf" id="2KPm2gx0t0m" role="3clFbG">
-                                  <node concept="1pGfFk" id="2KPm2gx0uFg" role="2ShVmc">
-                                    <ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
-                                    <node concept="37vLTw" id="2KPm2gx0uOD" role="37wK5m">
-                                      <ref role="3cqZAo" node="2KPm2gx0sY4" resolve="color" />
-                                    </node>
-                                    <node concept="37vLTw" id="2KPm2gx0uZP" role="37wK5m">
-                                      <ref role="3cqZAo" node="2KPm2gx0sY4" resolve="color" />
+                                <node concept="3clFbF" id="2KPm2gx0t0q" role="3cqZAp">
+                                  <node concept="2ShNRf" id="2KPm2gx0t0m" role="3clFbG">
+                                    <node concept="1pGfFk" id="2KPm2gx0uFg" role="2ShVmc">
+                                      <ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
+                                      <node concept="37vLTw" id="2KPm2gx0uOD" role="37wK5m">
+                                        <ref role="3cqZAo" node="2KPm2gx0sY4" resolve="color" />
+                                      </node>
+                                      <node concept="37vLTw" id="2KPm2gx0uZP" role="37wK5m">
+                                        <ref role="3cqZAo" node="2KPm2gx0sY4" resolve="color" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -1624,92 +1590,92 @@
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="1HlG4h" id="5neqlgc5LFq" role="3EZMnx">
-                        <ref role="1ERwB7" node="2T2PYK87bYY" resolve="NavigateToConstraintGroup" />
-                        <node concept="1HfYo3" id="5neqlgc5LFs" role="1HlULh">
-                          <node concept="3TQlhw" id="5neqlgc5LFu" role="1Hhtcw">
-                            <node concept="3clFbS" id="5neqlgc5LFw" role="2VODD2">
-                              <node concept="3clFbF" id="5neqlgc5LJR" role="3cqZAp">
-                                <node concept="2OqwBi" id="5neqlgc5LWT" role="3clFbG">
-                                  <node concept="pncrf" id="5neqlgc5LJQ" role="2Oq$k0" />
-                                  <node concept="3TrcHB" id="5neqlgc5MkQ" role="2OqNvi">
-                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        <node concept="1HlG4h" id="5neqlgc5LFq" role="3EZMnx">
+                          <ref role="1ERwB7" node="2T2PYK87bYY" resolve="NavigateToConstraintGroup" />
+                          <node concept="1HfYo3" id="5neqlgc5LFs" role="1HlULh">
+                            <node concept="3TQlhw" id="5neqlgc5LFu" role="1Hhtcw">
+                              <node concept="3clFbS" id="5neqlgc5LFw" role="2VODD2">
+                                <node concept="3clFbF" id="5neqlgc5LJR" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5neqlgc5LWT" role="3clFbG">
+                                    <node concept="pncrf" id="5neqlgc5LJQ" role="2Oq$k0" />
+                                    <node concept="3TrcHB" id="5neqlgc5MkQ" role="2OqNvi">
+                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="11LMrY" id="5neqlgc5MAo" role="3F10Kt">
+                            <property role="VOm3f" value="true" />
+                          </node>
                         </node>
-                        <node concept="11LMrY" id="5neqlgc5MAo" role="3F10Kt">
-                          <property role="VOm3f" value="true" />
-                        </node>
-                      </node>
-                      <node concept="1HlG4h" id="6OwVbfnAF$E" role="3EZMnx">
-                        <node concept="1HfYo3" id="6OwVbfnAF$F" role="1HlULh">
-                          <node concept="3TQlhw" id="6OwVbfnAF$G" role="1Hhtcw">
-                            <node concept="3clFbS" id="6OwVbfnAF$H" role="2VODD2">
-                              <node concept="3cpWs8" id="1BW0KPicEhd" role="3cqZAp">
-                                <node concept="3cpWsn" id="1BW0KPicEhg" role="3cpWs9">
-                                  <property role="TrG5h" value="groupConstraints" />
-                                  <node concept="3vKaQO" id="1BW0KPicGfq" role="1tU5fm">
-                                    <node concept="3Tqbb2" id="1BW0KPicGfs" role="3O5elw">
-                                      <ref role="ehGHo" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+                        <node concept="1HlG4h" id="6OwVbfnAF$E" role="3EZMnx">
+                          <node concept="1HfYo3" id="6OwVbfnAF$F" role="1HlULh">
+                            <node concept="3TQlhw" id="6OwVbfnAF$G" role="1Hhtcw">
+                              <node concept="3clFbS" id="6OwVbfnAF$H" role="2VODD2">
+                                <node concept="3cpWs8" id="1BW0KPicEhd" role="3cqZAp">
+                                  <node concept="3cpWsn" id="1BW0KPicEhg" role="3cpWs9">
+                                    <property role="TrG5h" value="groupConstraints" />
+                                    <node concept="3vKaQO" id="1BW0KPicGfq" role="1tU5fm">
+                                      <node concept="3Tqbb2" id="1BW0KPicGfs" role="3O5elw">
+                                        <ref role="ehGHo" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+                                      </node>
+                                    </node>
+                                    <node concept="2YIFZM" id="1BW0KPicEhj" role="33vP2m">
+                                      <ref role="1Pybhc" node="6OwVbfnTAQE" resolve="ConstraintsHelper" />
+                                      <ref role="37wK5l" node="1BW0KPi56Vd" resolve="constraintsOf" />
+                                      <node concept="pncrf" id="1BW0KPicEhk" role="37wK5m" />
                                     </node>
-                                  </node>
-                                  <node concept="2YIFZM" id="1BW0KPicEhj" role="33vP2m">
-                                    <ref role="1Pybhc" node="6OwVbfnTAQE" resolve="ConstraintsHelper" />
-                                    <ref role="37wK5l" node="1BW0KPi56Vd" resolve="constraintsOf" />
-                                    <node concept="pncrf" id="1BW0KPicEhk" role="37wK5m" />
                                   </node>
                                 </node>
-                              </node>
-                              <node concept="3clFbH" id="1BW0KPicEgH" role="3cqZAp" />
-                              <node concept="3cpWs8" id="6OwVbfo4VKP" role="3cqZAp">
-                                <node concept="3cpWsn" id="6OwVbfo4VKS" role="3cpWs9">
-                                  <property role="TrG5h" value="size" />
-                                  <node concept="10Oyi0" id="6OwVbfo4VKN" role="1tU5fm" />
-                                  <node concept="2OqwBi" id="6OwVbfo4WiZ" role="33vP2m">
-                                    <node concept="34oBXx" id="6OwVbfo4WFD" role="2OqNvi" />
-                                    <node concept="37vLTw" id="1BW0KPicEyR" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1BW0KPicEhg" resolve="groupConstraints" />
+                                <node concept="3clFbH" id="1BW0KPicEgH" role="3cqZAp" />
+                                <node concept="3cpWs8" id="6OwVbfo4VKP" role="3cqZAp">
+                                  <node concept="3cpWsn" id="6OwVbfo4VKS" role="3cpWs9">
+                                    <property role="TrG5h" value="size" />
+                                    <node concept="10Oyi0" id="6OwVbfo4VKN" role="1tU5fm" />
+                                    <node concept="2OqwBi" id="6OwVbfo4WiZ" role="33vP2m">
+                                      <node concept="34oBXx" id="6OwVbfo4WFD" role="2OqNvi" />
+                                      <node concept="37vLTw" id="1BW0KPicEyR" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="1BW0KPicEhg" resolve="groupConstraints" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
-                              </node>
-                              <node concept="3clFbF" id="6OwVbfnAFEC" role="3cqZAp">
-                                <node concept="3cpWs3" id="6OwVbfo4Xqq" role="3clFbG">
-                                  <node concept="Xl_RD" id="6OwVbfo4XmA" role="3uHU7w">
-                                    <property role="Xl_RC" value=")" />
-                                  </node>
-                                  <node concept="3cpWs3" id="6OwVbfo4VC1" role="3uHU7B">
-                                    <node concept="3cpWs3" id="6OwVbfo4VC2" role="3uHU7B">
-                                      <node concept="3cpWs3" id="6OwVbfo7fYl" role="3uHU7B">
-                                        <node concept="37vLTw" id="6OwVbfo7gbl" role="3uHU7w">
-                                          <ref role="3cqZAo" node="6OwVbfo4VKS" resolve="size" />
-                                        </node>
-                                        <node concept="Xl_RD" id="6OwVbfo4VB6" role="3uHU7B">
-                                          <property role="Xl_RC" value=" (" />
-                                        </node>
-                                      </node>
-                                      <node concept="Xl_RD" id="6OwVbfo4VC4" role="3uHU7w">
-                                        <property role="Xl_RC" value=" Constraint" />
-                                      </node>
+                                <node concept="3clFbF" id="6OwVbfnAFEC" role="3cqZAp">
+                                  <node concept="3cpWs3" id="6OwVbfo4Xqq" role="3clFbG">
+                                    <node concept="Xl_RD" id="6OwVbfo4XmA" role="3uHU7w">
+                                      <property role="Xl_RC" value=")" />
                                     </node>
-                                    <node concept="1eOMI4" id="6OwVbfo4VC5" role="3uHU7w">
-                                      <node concept="3K4zz7" id="6OwVbfo4VC6" role="1eOMHV">
-                                        <node concept="Xl_RD" id="6OwVbfo4VC7" role="3K4E3e">
-                                          <property role="Xl_RC" value="" />
+                                    <node concept="3cpWs3" id="6OwVbfo4VC1" role="3uHU7B">
+                                      <node concept="3cpWs3" id="6OwVbfo4VC2" role="3uHU7B">
+                                        <node concept="3cpWs3" id="6OwVbfo7fYl" role="3uHU7B">
+                                          <node concept="37vLTw" id="6OwVbfo7gbl" role="3uHU7w">
+                                            <ref role="3cqZAo" node="6OwVbfo4VKS" resolve="size" />
+                                          </node>
+                                          <node concept="Xl_RD" id="6OwVbfo4VB6" role="3uHU7B">
+                                            <property role="Xl_RC" value=" (" />
+                                          </node>
                                         </node>
-                                        <node concept="Xl_RD" id="6OwVbfo4VC8" role="3K4GZi">
-                                          <property role="Xl_RC" value="s" />
+                                        <node concept="Xl_RD" id="6OwVbfo4VC4" role="3uHU7w">
+                                          <property role="Xl_RC" value=" Constraint" />
                                         </node>
-                                        <node concept="2dkUwp" id="6OwVbfo4VC9" role="3K4Cdx">
-                                          <node concept="37vLTw" id="6OwVbfo4VCa" role="3uHU7B">
-                                            <ref role="3cqZAo" node="6OwVbfo4VKS" resolve="size" />
+                                      </node>
+                                      <node concept="1eOMI4" id="6OwVbfo4VC5" role="3uHU7w">
+                                        <node concept="3K4zz7" id="6OwVbfo4VC6" role="1eOMHV">
+                                          <node concept="Xl_RD" id="6OwVbfo4VC7" role="3K4E3e">
+                                            <property role="Xl_RC" value="" />
                                           </node>
-                                          <node concept="3cmrfG" id="6OwVbfo4VCb" role="3uHU7w">
-                                            <property role="3cmrfH" value="1" />
+                                          <node concept="Xl_RD" id="6OwVbfo4VC8" role="3K4GZi">
+                                            <property role="Xl_RC" value="s" />
+                                          </node>
+                                          <node concept="2dkUwp" id="6OwVbfo4VC9" role="3K4Cdx">
+                                            <node concept="37vLTw" id="6OwVbfo4VCa" role="3uHU7B">
+                                              <ref role="3cqZAo" node="6OwVbfo4VKS" resolve="size" />
+                                            </node>
+                                            <node concept="3cmrfG" id="6OwVbfo4VCb" role="3uHU7w">
+                                              <property role="3cmrfH" value="1" />
+                                            </node>
                                           </node>
                                         </node>
                                       </node>
@@ -1724,50 +1690,50 @@
                     </node>
                   </node>
                 </node>
-              </node>
-              <node concept="2iRkQZ" id="6OwVbfnGJ4T" role="2czzBy" />
-              <node concept="pkWqt" id="6OwVbfoyhC1" role="pqm2j">
-                <node concept="3clFbS" id="6OwVbfoyhC2" role="2VODD2">
-                  <node concept="3clFbF" id="6OwVbfoyhKo" role="3cqZAp">
-                    <node concept="2OqwBi" id="1BW0KPic$y7" role="3clFbG">
-                      <node concept="2OqwBi" id="1BW0KPicxnT" role="2Oq$k0">
-                        <node concept="pncrf" id="1BW0KPicwXx" role="2Oq$k0" />
-                        <node concept="3Tsc0h" id="1BW0KPicy7V" role="2OqNvi">
-                          <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
+                <node concept="2iRkQZ" id="6OwVbfnGJ4T" role="2czzBy" />
+                <node concept="pkWqt" id="6OwVbfoyhC1" role="pqm2j">
+                  <node concept="3clFbS" id="6OwVbfoyhC2" role="2VODD2">
+                    <node concept="3clFbF" id="6OwVbfoyhKo" role="3cqZAp">
+                      <node concept="2OqwBi" id="1BW0KPic$y7" role="3clFbG">
+                        <node concept="2OqwBi" id="1BW0KPicxnT" role="2Oq$k0">
+                          <node concept="pncrf" id="1BW0KPicwXx" role="2Oq$k0" />
+                          <node concept="3Tsc0h" id="1BW0KPicy7V" role="2OqNvi">
+                            <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" />
+                          </node>
                         </node>
-                      </node>
-                      <node concept="2HwmR7" id="1BW0KPic$Fk" role="2OqNvi">
-                        <node concept="1bVj0M" id="1BW0KPic$Fl" role="23t8la">
-                          <node concept="3clFbS" id="1BW0KPic$Fm" role="1bW5cS">
-                            <node concept="3clFbF" id="1BW0KPic$Fn" role="3cqZAp">
-                              <node concept="2OqwBi" id="1BW0KPic$Fo" role="3clFbG">
-                                <node concept="2OqwBi" id="1BW0KPic$Fp" role="2Oq$k0">
-                                  <node concept="2OqwBi" id="1BW0KPic$Fq" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="1BW0KPic$Fr" role="2Oq$k0">
-                                      <node concept="37vLTw" id="1BW0KPic$Fs" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2r1kIC$yAnE" resolve="constraint" />
-                                      </node>
-                                      <node concept="3CFZ6_" id="1BW0KPic$Ft" role="2OqNvi">
-                                        <node concept="3CFYIy" id="1BW0KPic$Fu" role="3CFYIz">
-                                          <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                        <node concept="2HwmR7" id="1BW0KPic$Fk" role="2OqNvi">
+                          <node concept="1bVj0M" id="1BW0KPic$Fl" role="23t8la">
+                            <node concept="3clFbS" id="1BW0KPic$Fm" role="1bW5cS">
+                              <node concept="3clFbF" id="1BW0KPic$Fn" role="3cqZAp">
+                                <node concept="2OqwBi" id="1BW0KPic$Fo" role="3clFbG">
+                                  <node concept="2OqwBi" id="1BW0KPic$Fp" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="1BW0KPic$Fq" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="1BW0KPic$Fr" role="2Oq$k0">
+                                        <node concept="37vLTw" id="1BW0KPic$Fs" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="2r1kIC$yAnE" resolve="constraint" />
                                         </node>
+                                        <node concept="3CFZ6_" id="1BW0KPic$Ft" role="2OqNvi">
+                                          <node concept="3CFYIy" id="1BW0KPic$Fu" role="3CFYIz">
+                                            <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3TrEf2" id="1BW0KPic$Fv" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
                                       </node>
                                     </node>
-                                    <node concept="3TrEf2" id="1BW0KPic$Fv" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
+                                    <node concept="3TrEf2" id="1BW0KPic$Fw" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" />
                                     </node>
                                   </node>
-                                  <node concept="3TrEf2" id="1BW0KPic$Fw" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
-                                  </node>
+                                  <node concept="3x8VRR" id="1BW0KPic$Fx" role="2OqNvi" />
                                 </node>
-                                <node concept="3x8VRR" id="1BW0KPic$Fx" role="2OqNvi" />
                               </node>
                             </node>
-                          </node>
-                          <node concept="gl6BB" id="2r1kIC$yAnE" role="1bW2Oz">
-                            <property role="TrG5h" value="constraint" />
-                            <node concept="2jxLKc" id="2r1kIC$yAnF" role="1tU5fm" />
+                            <node concept="gl6BB" id="2r1kIC$yAnE" role="1bW2Oz">
+                              <property role="TrG5h" value="constraint" />
+                              <node concept="2jxLKc" id="2r1kIC$yAnF" role="1tU5fm" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -1775,42 +1741,73 @@
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="2iRkQZ" id="6OwVbfnAoAg" role="2iSdaV" />
-            <node concept="3F2HdR" id="4L$vDwV2VWe" role="3EZMnx">
-              <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
-              <ref role="1NtTu8" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
-              <node concept="2iRkQZ" id="4L$vDwV2VWg" role="2czzBx" />
-              <node concept="107P5z" id="6OwVbfnEtQg" role="12AuX0">
-                <node concept="3clFbS" id="6OwVbfnEtQh" role="2VODD2">
-                  <node concept="3clFbF" id="6OwVbfnEtUb" role="3cqZAp">
-                    <node concept="2OqwBi" id="6OwVbfnEw4T" role="3clFbG">
-                      <node concept="2OqwBi" id="6OwVbfnEvBo" role="2Oq$k0">
-                        <node concept="2OqwBi" id="6OwVbfnEuHC" role="2Oq$k0">
-                          <node concept="2OqwBi" id="6OwVbfnEu7v" role="2Oq$k0">
-                            <node concept="12_Ws6" id="6OwVbfnEtUa" role="2Oq$k0" />
-                            <node concept="3CFZ6_" id="6OwVbfnEuol" role="2OqNvi">
-                              <node concept="3CFYIy" id="6OwVbfnEuuq" role="3CFYIz">
-                                <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+              <node concept="2iRkQZ" id="6OwVbfnAoAg" role="2iSdaV" />
+              <node concept="3F2HdR" id="4L$vDwV2VWe" role="3EZMnx">
+                <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
+                <ref role="1NtTu8" to="s6b7:4L$vDwV2mVd" />
+                <node concept="2iRkQZ" id="4L$vDwV2VWg" role="2czzBx" />
+                <node concept="107P5z" id="6OwVbfnEtQg" role="12AuX0">
+                  <node concept="3clFbS" id="6OwVbfnEtQh" role="2VODD2">
+                    <node concept="3clFbF" id="6OwVbfnEtUb" role="3cqZAp">
+                      <node concept="2OqwBi" id="6OwVbfnEw4T" role="3clFbG">
+                        <node concept="2OqwBi" id="6OwVbfnEvBo" role="2Oq$k0">
+                          <node concept="2OqwBi" id="6OwVbfnEuHC" role="2Oq$k0">
+                            <node concept="2OqwBi" id="6OwVbfnEu7v" role="2Oq$k0">
+                              <node concept="12_Ws6" id="6OwVbfnEtUa" role="2Oq$k0" />
+                              <node concept="3CFZ6_" id="6OwVbfnEuol" role="2OqNvi">
+                                <node concept="3CFYIy" id="6OwVbfnEuuq" role="3CFYIz">
+                                  <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                                </node>
                               </node>
                             </node>
+                            <node concept="3TrEf2" id="6OwVbfnEvpm" role="2OqNvi">
+                              <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
+                            </node>
                           </node>
-                          <node concept="3TrEf2" id="6OwVbfnEvpm" role="2OqNvi">
-                            <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
+                          <node concept="3TrEf2" id="6OwVbfnEvXI" role="2OqNvi">
+                            <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" />
                           </node>
                         </node>
-                        <node concept="3TrEf2" id="6OwVbfnEvXI" role="2OqNvi">
-                          <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
-                        </node>
+                        <node concept="3w_OXm" id="6OwVbfnEwhN" role="2OqNvi" />
                       </node>
-                      <node concept="3w_OXm" id="6OwVbfnEwhN" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="PMmxH" id="2539ELgakoj" role="3v1y6z">
+              <ref role="PMmxG" node="2539ELgaeLc" resolve="RootConstraintsHeadline" />
+            </node>
+          </node>
+          <node concept="3EZMnI" id="2539ELgaHR8" role="1QoVPY">
+            <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
+            <node concept="2iRkQZ" id="2539ELgaHR9" role="2iSdaV" />
+            <node concept="VPM3Z" id="2539ELgaHRa" role="3F10Kt" />
+            <node concept="3EZMnI" id="2539ELgSR0u" role="3EZMnx">
+              <node concept="VPM3Z" id="2539ELgSR0w" role="3F10Kt" />
+              <node concept="PMmxH" id="2539ELgSR0$" role="3EZMnx">
+                <ref role="PMmxG" node="2539ELgaeLc" resolve="RootConstraintsHeadline" />
+              </node>
+              <node concept="3F0ifn" id="2539ELgSR0A" role="3EZMnx">
+                <property role="3F0ifm" value=":" />
+              </node>
+              <node concept="2iRfu4" id="2539ELgSR0z" role="2iSdaV" />
+            </node>
+            <node concept="3EZMnI" id="2539ELgDv_F" role="3EZMnx">
+              <node concept="VPM3Z" id="2539ELgDv_H" role="3F10Kt" />
+              <node concept="3XFhqQ" id="2539ELgDv_L" role="3EZMnx" />
+              <node concept="3F2HdR" id="2539ELgq6Dd" role="3EZMnx">
+                <ref role="1NtTu8" to="s6b7:4L$vDwV2mVd" />
+                <node concept="2iRkQZ" id="2539ELgq6De" role="2czzBx" />
+              </node>
+              <node concept="2iRfu4" id="2539ELgDv_K" role="2iSdaV" />
+            </node>
           </node>
         </node>
+        <node concept="2iRfu4" id="2539ELgaxB9" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="4L$vDwV2y4d" role="3EZMnx">
+        <node concept="VPM3Z" id="4L$vDwV2y4f" role="3F10Kt" />
         <node concept="2iRfu4" id="4L$vDwV2y4i" role="2iSdaV" />
       </node>
     </node>
@@ -11753,7 +11750,97 @@
   <node concept="24kQdi" id="5neqlgbEFkg">
     <property role="3GE5qa" value="constraints" />
     <ref role="1XX52x" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
-    <node concept="B$lHz" id="5neqlgbEFki" role="2wV5jI" />
+    <node concept="3EZMnI" id="2539ELgDv_P" role="2wV5jI">
+      <node concept="3F0ifn" id="2539ELgDv_V" role="3EZMnx">
+        <property role="3F0ifm" value="[" />
+        <node concept="VechU" id="2539ELi1Nei" role="3F10Kt">
+          <node concept="3ZlJ5R" id="2539ELi1Nej" role="VblUZ">
+            <node concept="3clFbS" id="2539ELi1Nek" role="2VODD2">
+              <node concept="3clFbF" id="2539ELi1Nel" role="3cqZAp">
+                <node concept="2OqwBi" id="2539ELi1Nem" role="3clFbG">
+                  <node concept="2OqwBi" id="2539ELi1Nen" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2539ELi1Neo" role="2Oq$k0">
+                      <node concept="pncrf" id="2539ELi1Nep" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2539ELi1Neq" role="2OqNvi">
+                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="2539ELi1Ner" role="2OqNvi">
+                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" />
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="2539ELi1Nes" role="2OqNvi">
+                    <ref role="37wK5l" to="zccc:6OwVbfnk$cR" resolve="getColor" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="11LMrY" id="2539ELi1OF6" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F1sOY" id="2539ELgDvQo" role="3EZMnx">
+        <ref role="1NtTu8" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
+        <node concept="VechU" id="2539ELgSTZq" role="3F10Kt">
+          <node concept="3ZlJ5R" id="2539ELgSTZs" role="VblUZ">
+            <node concept="3clFbS" id="2539ELgSTZt" role="2VODD2">
+              <node concept="3clFbF" id="2539ELgSUdX" role="3cqZAp">
+                <node concept="2OqwBi" id="2539ELgSVv4" role="3clFbG">
+                  <node concept="2OqwBi" id="2539ELgSUYZ" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2539ELgSUsR" role="2Oq$k0">
+                      <node concept="pncrf" id="2539ELgSUdW" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2539ELgSUJr" role="2OqNvi">
+                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="2539ELgSVet" role="2OqNvi">
+                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="2539ELgSVLh" role="2OqNvi">
+                    <ref role="37wK5l" to="zccc:6OwVbfnk$cR" resolve="getColor" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="2539ELh8h$B" role="3EZMnx">
+        <property role="3F0ifm" value="]" />
+        <node concept="VechU" id="2539ELi1NMF" role="3F10Kt">
+          <node concept="3ZlJ5R" id="2539ELi1NMG" role="VblUZ">
+            <node concept="3clFbS" id="2539ELi1NMH" role="2VODD2">
+              <node concept="3clFbF" id="2539ELi1NMI" role="3cqZAp">
+                <node concept="2OqwBi" id="2539ELi1NMJ" role="3clFbG">
+                  <node concept="2OqwBi" id="2539ELi1NMK" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2539ELi1NML" role="2Oq$k0">
+                      <node concept="pncrf" id="2539ELi1NMM" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2539ELi1NMN" role="2OqNvi">
+                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="2539ELi1NMO" role="2OqNvi">
+                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" />
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="2539ELi1NMP" role="2OqNvi">
+                    <ref role="37wK5l" to="zccc:6OwVbfnk$cR" resolve="getColor" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="11L4FC" id="2539ELi1Pm3" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="2SsqMj" id="2539ELgDvQi" role="3EZMnx" />
+      <node concept="2iRfu4" id="2539ELgDv_S" role="2iSdaV" />
+    </node>
   </node>
   <node concept="312cEu" id="6OwVbfnTAQE">
     <property role="3GE5qa" value="constraints" />
@@ -12753,5 +12840,100 @@
     <node concept="22hDWj" id="367j$Y_Cgd6" role="22hAXT" />
     <node concept="2VfDsV" id="367j$Y_Cgd7" role="3ft7WO" />
   </node>
+  <node concept="PKFIW" id="2539ELgaeLc">
+    <property role="3GE5qa" value="treenodes" />
+    <property role="TrG5h" value="RootConstraintsHeadline" />
+    <ref role="1XX52x" to="s6b7:3tsFshP5E8h" resolve="FeatureModel" />
+    <node concept="3EZMnI" id="2539ELgaf2f" role="2wV5jI">
+      <node concept="2iRfu4" id="2539ELgaf2g" role="2iSdaV" />
+      <node concept="1HlG4h" id="2539ELgaf2h" role="3EZMnx">
+        <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
+        <node concept="1HfYo3" id="2539ELgaf2i" role="1HlULh">
+          <node concept="3TQlhw" id="2539ELgaf2j" role="1Hhtcw">
+            <node concept="3clFbS" id="2539ELgaf2k" role="2VODD2">
+              <node concept="3cpWs8" id="2539ELgaf2l" role="3cqZAp">
+                <node concept="3cpWsn" id="2539ELgaf2m" role="3cpWs9">
+                  <property role="TrG5h" value="size" />
+                  <node concept="10Oyi0" id="2539ELgaf2n" role="1tU5fm" />
+                  <node concept="2OqwBi" id="2539ELgaf2o" role="33vP2m">
+                    <node concept="2OqwBi" id="2539ELgaf2p" role="2Oq$k0">
+                      <node concept="pncrf" id="2539ELgaf2q" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="2539ELgaf2r" role="2OqNvi">
+                        <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" />
+                      </node>
+                    </node>
+                    <node concept="34oBXx" id="2539ELgaf2s" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="2539ELgaf2t" role="3cqZAp">
+                <node concept="3clFbS" id="2539ELgaf2u" role="3clFbx">
+                  <node concept="3cpWs6" id="2539ELgaf2v" role="3cqZAp">
+                    <node concept="Xl_RD" id="2539ELgaf2w" role="3cqZAk">
+                      <property role="Xl_RC" value="No Root Constraints" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2dkUwp" id="2539ELgaf2x" role="3clFbw">
+                  <node concept="3cmrfG" id="2539ELgaf2y" role="3uHU7w">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                  <node concept="37vLTw" id="2539ELgaf2z" role="3uHU7B">
+                    <ref role="3cqZAo" node="2539ELgaf2m" resolve="size" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="2539ELgaf2$" role="3cqZAp">
+                <node concept="3cpWs3" id="2539ELgaf2_" role="3clFbG">
+                  <node concept="3cpWs3" id="2539ELgaf2A" role="3uHU7B">
+                    <node concept="37vLTw" id="2539ELgaf2B" role="3uHU7B">
+                      <ref role="3cqZAo" node="2539ELgaf2m" resolve="size" />
+                    </node>
+                    <node concept="Xl_RD" id="2539ELgaf2C" role="3uHU7w">
+                      <property role="Xl_RC" value=" Root Constraint" />
+                    </node>
+                  </node>
+                  <node concept="1eOMI4" id="2539ELgaf2D" role="3uHU7w">
+                    <node concept="3K4zz7" id="2539ELgaf2E" role="1eOMHV">
+                      <node concept="Xl_RD" id="2539ELgaf2F" role="3K4E3e">
+                        <property role="Xl_RC" value="" />
+                      </node>
+                      <node concept="Xl_RD" id="2539ELgaf2G" role="3K4GZi">
+                        <property role="Xl_RC" value="s" />
+                      </node>
+                      <node concept="2dkUwp" id="2539ELgaf2H" role="3K4Cdx">
+                        <node concept="37vLTw" id="2539ELgaf2I" role="3uHU7B">
+                          <ref role="3cqZAo" node="2539ELgaf2m" resolve="size" />
+                        </node>
+                        <node concept="3cmrfG" id="2539ELgaf2J" role="3uHU7w">
+                          <property role="3cmrfH" value="1" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="2539ELgaf2K" role="3EZMnx">
+        <property role="3F0ifm" value="with grouping" />
+        <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
+        <node concept="VPM3Z" id="2539ELgaf2L" role="3F10Kt" />
+      </node>
+      <node concept="1iCGBv" id="2539ELgaf2M" role="3EZMnx">
+        <property role="1$x2rV" value="none" />
+        <ref role="1NtTu8" to="s6b7:6OwVbfncVTn" />
+        <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
+        <node concept="1sVBvm" id="2539ELgaf2N" role="1sWHZn">
+          <node concept="3F0A7n" id="2539ELgaf2O" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
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 a63164b430..d063d5b8ca 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
@@ -67,6 +67,8 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="1153417849900" name="jetbrains.mps.baseLanguage.structure.GreaterThanOrEqualsExpression" flags="nn" index="2d3UOw" />
+      <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
@@ -310,6 +312,7 @@
       <concept id="4705942098322467729" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="ng" index="21nZrQ">
         <reference id="4705942098322467736" name="decl" index="21nZrZ" />
       </concept>
+      <concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
@@ -320,6 +323,9 @@
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
+        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
+      </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="8758390115028452779" name="jetbrains.mps.lang.smodel.structure.Node_GetReferencesOperation" flags="nn" index="2z74zc" />
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
@@ -331,6 +337,9 @@
         <child id="1143224066849" name="insertedNode" index="HtI8F" />
       </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
       <concept id="8329979535468945057" name="jetbrains.mps.lang.smodel.structure.Node_PresentationOperation" flags="ng" index="2Iv5rx" />
       <concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
         <reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
@@ -347,7 +356,9 @@
       <concept id="1181952871644" name="jetbrains.mps.lang.smodel.structure.Concept_GetAllSubConcepts" flags="nn" index="LSoRf">
         <child id="1182506816063" name="smodel" index="1iTxcG" />
       </concept>
+      <concept id="7504436213544206332" name="jetbrains.mps.lang.smodel.structure.Node_ContainingLinkOperation" flags="nn" index="2NL2c5" />
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
+      <concept id="1145573345940" name="jetbrains.mps.lang.smodel.structure.Node_GetAllSiblingsOperation" flags="nn" index="2TvwIu" />
       <concept id="1966870290088668520" name="jetbrains.mps.lang.smodel.structure.Enum_MembersOperation" flags="ng" index="2ViDtN" />
       <concept id="1966870290088668512" name="jetbrains.mps.lang.smodel.structure.Enum_MemberLiteral" flags="ng" index="2ViDtV">
         <reference id="1966870290088668516" name="memberDeclaration" index="2ViDtZ" />
@@ -386,6 +397,7 @@
       <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
         <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
       </concept>
+      <concept id="2285351689971718149" name="jetbrains.mps.lang.smodel.structure.AggregationLinkType" flags="ig" index="3GbmH5" />
       <concept id="1172326502327" name="jetbrains.mps.lang.smodel.structure.Concept_IsExactlyOperation" flags="nn" index="3O6GUB">
         <child id="1206733650006" name="conceptArgument" index="3QVz_e" />
       </concept>
@@ -489,6 +501,7 @@
         <child id="1225711182005" name="list" index="1y566C" />
         <child id="1225711191269" name="index" index="1y58nS" />
       </concept>
+      <concept id="1225730411176" name="jetbrains.mps.baseLanguage.collections.structure.FindLastOperation" flags="nn" index="1zesIP" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -6358,6 +6371,22 @@
     </node>
     <node concept="2Sbjvc" id="6OwVbfoj094" role="2ZfgGD">
       <node concept="3clFbS" id="6OwVbfoj095" role="2VODD2">
+        <node concept="3SKdUt" id="2539ELhqbLM" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhqbLN" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhqbLO" role="1PaTwD">
+              <property role="3oM_SC" value="Remove" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhqbMB" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhqbN1" role="1PaTwD">
+              <property role="3oM_SC" value="group" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhqbNK" role="1PaTwD">
+              <property role="3oM_SC" value="annotation." />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6OwVbfoj1nr" role="3cqZAp">
           <node concept="2OqwBi" id="6OwVbfoj1G1" role="3clFbG">
             <node concept="2OqwBi" id="6OwVbfoj1pX" role="2Oq$k0">
@@ -6371,6 +6400,62 @@
             <node concept="3YRAZt" id="6OwVbfoj1XK" role="2OqNvi" />
           </node>
         </node>
+        <node concept="3clFbH" id="2539ELhqbOB" role="3cqZAp" />
+        <node concept="3SKdUt" id="2539ELhqbT5" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhqbT6" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhqbT7" role="1PaTwD">
+              <property role="3oM_SC" value="Reposition" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhqbTY" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhqbUo" role="1PaTwD">
+              <property role="3oM_SC" value="constraint." />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2539ELhqc1E" role="3cqZAp">
+          <node concept="3cpWsn" id="2539ELhqc1H" role="3cpWs9">
+            <property role="TrG5h" value="parent" />
+            <node concept="3Tqbb2" id="2539ELhqc1C" role="1tU5fm" />
+            <node concept="2OqwBi" id="2539ELhqcdO" role="33vP2m">
+              <node concept="2Sf5sV" id="2539ELhqc5s" role="2Oq$k0" />
+              <node concept="1mfA1w" id="2539ELhqcAu" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2539ELhqcGI" role="3cqZAp">
+          <node concept="3cpWsn" id="2539ELhqcGL" role="3cpWs9">
+            <property role="TrG5h" value="parentAggregation" />
+            <node concept="3GbmH5" id="2539ELhqcGG" role="1tU5fm" />
+            <node concept="2OqwBi" id="2539ELhqcWm" role="33vP2m">
+              <node concept="2Sf5sV" id="2539ELhqcMh" role="2Oq$k0" />
+              <node concept="2NL2c5" id="2539ELhqdl_" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2539ELhqds7" role="3cqZAp">
+          <node concept="2OqwBi" id="2539ELhqdAP" role="3clFbG">
+            <node concept="2Sf5sV" id="2539ELhqds6" role="2Oq$k0" />
+            <node concept="3YRAZt" id="2539ELhqe1A" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="2539ELhqe9p" role="3cqZAp">
+          <node concept="2OqwBi" id="2539ELhqelN" role="3clFbG">
+            <node concept="liA8E" id="2539ELhqeEq" role="2OqNvi">
+              <ref role="37wK5l" to="mhbf:~SNode.addChild(org.jetbrains.mps.openapi.language.SContainmentLink,org.jetbrains.mps.openapi.model.SNode)" resolve="addChild" />
+              <node concept="37vLTw" id="2539ELhqeFf" role="37wK5m">
+                <ref role="3cqZAo" node="2539ELhqcGL" resolve="parentAggregation" />
+              </node>
+              <node concept="2Sf5sV" id="2539ELhqeXF" role="37wK5m" />
+            </node>
+            <node concept="2JrnkZ" id="2539ELhqelS" role="2Oq$k0">
+              <node concept="37vLTw" id="2539ELhqe9n" role="2JrQYb">
+                <ref role="3cqZAo" node="2539ELhqc1H" resolve="parent" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2SaL7w" id="6OwVbfoj0ux" role="2ZfVeh">
@@ -6455,6 +6540,23 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="2539ELhEZqV" role="3cqZAp" />
+        <node concept="3SKdUt" id="2539ELhF13q" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhF13r" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhF1gW" role="1PaTwD">
+              <property role="3oM_SC" value="Update" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhF1hq" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhF1jw" role="1PaTwD">
+              <property role="3oM_SC" value="group" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhF1ie" role="1PaTwD">
+              <property role="3oM_SC" value="annotation." />
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="5LIQgDoL5LZ" role="3cqZAp">
           <node concept="3cpWsn" id="5LIQgDoL5M0" role="3cpWs9">
             <property role="TrG5h" value="cg" />
@@ -6498,6 +6600,662 @@
           </node>
         </node>
         <node concept="3clFbH" id="5LIQgDoQHNm" role="3cqZAp" />
+        <node concept="3SKdUt" id="2539ELhF5hH" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhF5hI" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhF5hJ" role="1PaTwD">
+              <property role="3oM_SC" value="Reposition" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhF5hK" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhF5hL" role="1PaTwD">
+              <property role="3oM_SC" value="constraint." />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2539ELhFb7l" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhFb7m" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhFcJw" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFcJS" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFcJV" role="1PaTwD">
+              <property role="3oM_SC" value="Two" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFcLo" role="1PaTwD">
+              <property role="3oM_SC" value="chances" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFcMd" role="1PaTwD">
+              <property role="3oM_SC" value="algorithm:" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2539ELhFeyr" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhFeys" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhFeyt" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeJU" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeJX" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeKl" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeKH" role="1PaTwD">
+              <property role="3oM_SC" value="1." />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeMj" role="1PaTwD">
+              <property role="3oM_SC" value="chance:" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeN8" role="1PaTwD">
+              <property role="3oM_SC" value="If" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeNy" role="1PaTwD">
+              <property role="3oM_SC" value="there" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeNZ" role="1PaTwD">
+              <property role="3oM_SC" value="are" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeOM" role="1PaTwD">
+              <property role="3oM_SC" value="already" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFePh" role="1PaTwD">
+              <property role="3oM_SC" value="constraints" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeQw" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeQU" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeQZ" role="1PaTwD">
+              <property role="3oM_SC" value="requested" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeXW" role="1PaTwD">
+              <property role="3oM_SC" value="group" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2539ELhFeYJ" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhFeYl" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhFeYk" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgFQ" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGf" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGh" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGj" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGl" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGn" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGp" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGr" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGt" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGv" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGx" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgGT" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFgHh" role="1PaTwD">
+              <property role="3oM_SC" value="place" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeSK" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeSP" role="1PaTwD">
+              <property role="3oM_SC" value="updated" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeTk" role="1PaTwD">
+              <property role="3oM_SC" value="constraint" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeTQ" role="1PaTwD">
+              <property role="3oM_SC" value="after" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeUD" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeV4" role="1PaTwD">
+              <property role="3oM_SC" value="last" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeVw" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeVU" role="1PaTwD">
+              <property role="3oM_SC" value="these" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFeWH" role="1PaTwD">
+              <property role="3oM_SC" value="constraints." />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2539ELhFim5" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhFim6" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhFim7" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFiz$" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFizX" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFizZ" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFi$1" role="1PaTwD">
+              <property role="3oM_SC" value="2." />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFi$L" role="1PaTwD">
+              <property role="3oM_SC" value="chance:" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFi_A" role="1PaTwD">
+              <property role="3oM_SC" value="Otherwise" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFiAN" role="1PaTwD">
+              <property role="3oM_SC" value="place" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlBf" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlBE" role="1PaTwD">
+              <property role="3oM_SC" value="updated" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlCP" role="1PaTwD">
+              <property role="3oM_SC" value="constraint" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlDn" role="1PaTwD">
+              <property role="3oM_SC" value="after" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlDu" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlDT" role="1PaTwD">
+              <property role="3oM_SC" value="last" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlEl" role="1PaTwD">
+              <property role="3oM_SC" value="constraint" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlFd" role="1PaTwD">
+              <property role="3oM_SC" value="that" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlFD" role="1PaTwD">
+              <property role="3oM_SC" value="belongs" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlG8" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlGy" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFlGV" role="1PaTwD">
+              <property role="3oM_SC" value="group" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2539ELhFnlN" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhFnlO" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhFnlP" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp2I" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp37" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp39" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp3x" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp3z" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp3_" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp3B" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp3D" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp3F" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp3H" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp3J" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp4x" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp4T" role="1PaTwD">
+              <property role="3oM_SC" value="which" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp5l" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp5J" role="1PaTwD">
+              <property role="3oM_SC" value="listed" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp6d" role="1PaTwD">
+              <property role="3oM_SC" value="before" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp6F" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp76" role="1PaTwD">
+              <property role="3oM_SC" value="requested" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp8D" role="1PaTwD">
+              <property role="3oM_SC" value="group" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp9s" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp9Q" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFp9V" role="1PaTwD">
+              <property role="3oM_SC" value="configured" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFpkB" role="1PaTwD">
+              <property role="3oM_SC" value="root" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFpl3" role="1PaTwD">
+              <property role="3oM_SC" value="constraints" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFplW" role="1PaTwD">
+              <property role="3oM_SC" value="grouping." />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2539ELhFqZX" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhFqZY" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhFqZZ" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrds" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrdv" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrdR" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrdT" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrdV" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrdX" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrdZ" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFre1" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFre3" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFre5" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFre7" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFre9" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrex" role="1PaTwD">
+              <property role="3oM_SC" value="This" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFreW" role="1PaTwD">
+              <property role="3oM_SC" value="includes" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrg$" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrgZ" role="1PaTwD">
+              <property role="3oM_SC" value="case" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrhr" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrhP" role="1PaTwD">
+              <property role="3oM_SC" value="moving" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrhX" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFri2" role="1PaTwD">
+              <property role="3oM_SC" value="updated" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrix" role="1PaTwD">
+              <property role="3oM_SC" value="constraint" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrjp" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrjN" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrpy" role="1PaTwD">
+              <property role="3oM_SC" value="top" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2539ELhFrq4" role="3cqZAp">
+          <node concept="1PaTwC" id="2539ELhFrp_" role="1aUNEU">
+            <node concept="3oM_SD" id="2539ELhFt7J" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt7M" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8b" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8d" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8f" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8h" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8j" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8l" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8n" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8p" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8r" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8N" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt8P" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFt9d" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrkN" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrkS" role="1PaTwD">
+              <property role="3oM_SC" value="root" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrmo" role="1PaTwD">
+              <property role="3oM_SC" value="constraints" />
+            </node>
+            <node concept="3oM_SD" id="2539ELhFrnB" role="1PaTwD">
+              <property role="3oM_SC" value="sequence." />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2539ELhqgMq" role="3cqZAp">
+          <node concept="3cpWsn" id="2539ELhqgMt" role="3cpWs9">
+            <property role="TrG5h" value="parent" />
+            <node concept="3Tqbb2" id="2539ELhqgMo" role="1tU5fm" />
+            <node concept="2OqwBi" id="2539ELhqh1E" role="33vP2m">
+              <node concept="2Sf5sV" id="2539ELhqgTi" role="2Oq$k0" />
+              <node concept="1mfA1w" id="2539ELhqhBX" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2539ELhqhNN" role="3cqZAp">
+          <node concept="3cpWsn" id="2539ELhqhNQ" role="3cpWs9">
+            <property role="TrG5h" value="parentAggregation" />
+            <node concept="3GbmH5" id="2539ELhqhNL" role="1tU5fm" />
+            <node concept="2OqwBi" id="2539ELhqi6F" role="33vP2m">
+              <node concept="2Sf5sV" id="2539ELhqhWA" role="2Oq$k0" />
+              <node concept="2NL2c5" id="2539ELhqivW" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2539ELhqiFp" role="3cqZAp">
+          <node concept="3cpWsn" id="2539ELhqiFs" role="3cpWs9">
+            <property role="TrG5h" value="constraintSiblings" />
+            <node concept="2I9FWS" id="2539ELhqiFn" role="1tU5fm">
+              <ref role="2I9WkF" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+            </node>
+            <node concept="2OqwBi" id="2539ELhEU9R" role="33vP2m">
+              <node concept="2OqwBi" id="2539ELhEMu7" role="2Oq$k0">
+                <node concept="2OqwBi" id="2539ELhqiW0" role="2Oq$k0">
+                  <node concept="2Sf5sV" id="2539ELhqiLV" role="2Oq$k0" />
+                  <node concept="2TvwIu" id="2539ELhqjkG" role="2OqNvi" />
+                </node>
+                <node concept="v3k3i" id="2539ELhEQcv" role="2OqNvi">
+                  <node concept="chp4Y" id="2539ELhEQf1" role="v3oSu">
+                    <ref role="cht4Q" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+                  </node>
+                </node>
+              </node>
+              <node concept="ANE8D" id="2539ELhEVwR" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2539ELhqjze" role="3cqZAp">
+          <node concept="3cpWsn" id="2539ELhqjzh" role="3cpWs9">
+            <property role="TrG5h" value="beforeSibling" />
+            <node concept="3Tqbb2" id="2539ELhqjzc" role="1tU5fm">
+              <ref role="ehGHo" to="s6b7:7Nu9WvXvIDc" resolve="AbstractConstraint" />
+            </node>
+            <node concept="2OqwBi" id="2539ELhqq3q" role="33vP2m">
+              <node concept="1zesIP" id="2539ELhqrsH" role="2OqNvi">
+                <node concept="1bVj0M" id="2539ELhqrsJ" role="23t8la">
+                  <node concept="3clFbS" id="2539ELhqrsK" role="1bW5cS">
+                    <node concept="3clFbF" id="2539ELhqrzy" role="3cqZAp">
+                      <node concept="3clFbC" id="2539ELhqytA" role="3clFbG">
+                        <node concept="2OqwBi" id="2539ELhq_Ud" role="3uHU7w">
+                          <node concept="37vLTw" id="2539ELhq$pg" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5LIQgDoL5M0" resolve="cg" />
+                          </node>
+                          <node concept="2bSWHS" id="2539ELhqBFb" role="2OqNvi" />
+                        </node>
+                        <node concept="2OqwBi" id="2539ELhquM3" role="3uHU7B">
+                          <node concept="2OqwBi" id="2539ELhqtHC" role="2Oq$k0">
+                            <node concept="2OqwBi" id="2539ELhqsJh" role="2Oq$k0">
+                              <node concept="2OqwBi" id="2539ELhqrU7" role="2Oq$k0">
+                                <node concept="37vLTw" id="2539ELhqrzx" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2539ELhqrsL" resolve="it" />
+                                </node>
+                                <node concept="3CFZ6_" id="2539ELhqsiE" role="2OqNvi">
+                                  <node concept="3CFYIy" id="2539ELhqsrp" role="3CFYIz">
+                                    <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="2539ELhqtrC" role="2OqNvi">
+                                <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="2539ELhquc8" role="2OqNvi">
+                              <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
+                            </node>
+                          </node>
+                          <node concept="2bSWHS" id="2539ELhqvnN" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="gl6BB" id="2539ELhqrsL" role="1bW2Oz">
+                    <property role="TrG5h" value="constraint" />
+                    <node concept="2jxLKc" id="2539ELhqrsM" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTw" id="2539ELhEXlK" role="2Oq$k0">
+                <ref role="3cqZAo" node="2539ELhqiFs" resolve="constraintSiblings" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2539ELhqEno" role="3cqZAp">
+          <node concept="3clFbS" id="2539ELhqEnq" role="3clFbx">
+            <node concept="3clFbF" id="2539ELhqGRw" role="3cqZAp">
+              <node concept="37vLTI" id="2539ELhqH7U" role="3clFbG">
+                <node concept="2OqwBi" id="2539ELhqNWv" role="37vLTx">
+                  <node concept="1zesIP" id="2539ELhqPoE" role="2OqNvi">
+                    <node concept="1bVj0M" id="2539ELhqPoG" role="23t8la">
+                      <node concept="3clFbS" id="2539ELhqPoH" role="1bW5cS">
+                        <node concept="3clFbF" id="2539ELhqPuJ" role="3cqZAp">
+                          <node concept="1Wc70l" id="2539ELhr1Lm" role="3clFbG">
+                            <node concept="2dkUwp" id="2539ELhrbrH" role="3uHU7w">
+                              <node concept="2OqwBi" id="2539ELhrcSo" role="3uHU7w">
+                                <node concept="37vLTw" id="2539ELhrcew" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5LIQgDoL5M0" resolve="cg" />
+                                </node>
+                                <node concept="2bSWHS" id="2539ELhrdqq" role="2OqNvi" />
+                              </node>
+                              <node concept="2OqwBi" id="2539ELhr7r3" role="3uHU7B">
+                                <node concept="2OqwBi" id="2539ELhr63b" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="2539ELhr4Wl" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="2539ELhr35O" role="2Oq$k0">
+                                      <node concept="37vLTw" id="2539ELhr2se" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="2539ELhqPoI" resolve="it" />
+                                      </node>
+                                      <node concept="3CFZ6_" id="2539ELhr4b1" role="2OqNvi">
+                                        <node concept="3CFYIy" id="2539ELhr4vp" role="3CFYIz">
+                                          <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3TrEf2" id="2539ELhr5Op" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="2539ELhr6yB" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
+                                  </node>
+                                </node>
+                                <node concept="2bSWHS" id="2539ELhr8hH" role="2OqNvi" />
+                              </node>
+                            </node>
+                            <node concept="2d3UOw" id="2539ELhqWC4" role="3uHU7B">
+                              <node concept="2OqwBi" id="2539ELhqSXi" role="3uHU7B">
+                                <node concept="2OqwBi" id="2539ELhqRYK" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="2539ELhqQGl" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="2539ELhqPII" role="2Oq$k0">
+                                      <node concept="37vLTw" id="2539ELhqPuI" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="2539ELhqPoI" resolve="it" />
+                                      </node>
+                                      <node concept="3CFZ6_" id="2539ELhqQjn" role="2OqNvi">
+                                        <node concept="3CFYIy" id="2539ELhqQr3" role="3CFYIz">
+                                          <ref role="3CFYIx" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3TrEf2" id="2539ELhqRnD" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="2539ELhqSto" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
+                                  </node>
+                                </node>
+                                <node concept="2bSWHS" id="2539ELhqTDZ" role="2OqNvi" />
+                              </node>
+                              <node concept="3cmrfG" id="2539ELhqWMS" role="3uHU7w">
+                                <property role="3cmrfH" value="0" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="gl6BB" id="2539ELhqPoI" role="1bW2Oz">
+                        <property role="TrG5h" value="constraint" />
+                        <node concept="2jxLKc" id="2539ELhqPoJ" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="2539ELhEZ9b" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2539ELhqiFs" resolve="constraintSiblings" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="2539ELhqGRu" role="37vLTJ">
+                  <ref role="3cqZAo" node="2539ELhqjzh" resolve="beforeSiblings" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="2539ELhqEDs" role="3clFbw">
+            <node concept="37vLTw" id="2539ELhqEu4" role="2Oq$k0">
+              <ref role="3cqZAo" node="2539ELhqjzh" resolve="beforeSiblings" />
+            </node>
+            <node concept="3w_OXm" id="2539ELhqFl2" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="2539ELhrfTU" role="3cqZAp">
+          <node concept="2OqwBi" id="2539ELhrgmX" role="3clFbG">
+            <node concept="2Sf5sV" id="2539ELhrfTT" role="2Oq$k0" />
+            <node concept="3YRAZt" id="2539ELhrgM1" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="2539ELhrnF0" role="3cqZAp">
+          <node concept="2OqwBi" id="2539ELhro4g" role="3clFbG">
+            <node concept="liA8E" id="2539ELhrosL" role="2OqNvi">
+              <ref role="37wK5l" to="mhbf:~SNode.insertChildAfter(org.jetbrains.mps.openapi.language.SContainmentLink,org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="insertChildAfter" />
+              <node concept="37vLTw" id="2539ELhrotC" role="37wK5m">
+                <ref role="3cqZAo" node="2539ELhqhNQ" resolve="parentAggregation" />
+              </node>
+              <node concept="2Sf5sV" id="2539ELhrovR" role="37wK5m" />
+              <node concept="37vLTw" id="2539ELhrozz" role="37wK5m">
+                <ref role="3cqZAo" node="2539ELhqjzh" resolve="beforeSiblings" />
+              </node>
+            </node>
+            <node concept="2JrnkZ" id="2539ELhro4l" role="2Oq$k0">
+              <node concept="37vLTw" id="2539ELhrnEY" role="2JrQYb">
+                <ref role="3cqZAo" node="2539ELhqgMt" resolve="parent" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2539ELhqFqb" role="3cqZAp" />
         <node concept="3clFbF" id="6I7jpptBPrU" role="3cqZAp">
           <node concept="2OqwBi" id="6I7jpptBP$m" role="3clFbG">
             <node concept="1XNTG" id="6I7jpptBPrT" role="2Oq$k0" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/org.iets3.variability.featuremodel.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/org.iets3.variability.featuremodel.base.mpl
index 06ae68f2c2..90fead4ffb 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/org.iets3.variability.featuremodel.base.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/org.iets3.variability.featuremodel.base.mpl
@@ -40,6 +40,7 @@
     <dependency reexport="false">8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)</dependency>
     <dependency reexport="false">9b66c5c9-38bf-4315-a96f-9f4e212c69cb(org.iets3.variability.base)</dependency>
     <dependency reexport="false">71226ee2-bbc4-45d2-a41d-20b97237156c(org.iets3.variability.configuration.base)</dependency>
+    <dependency reexport="false">6fd1293f-7f65-4ffd-99dc-4719eca7c171(jetbrains.mps.ide.vcs.platform)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
@@ -152,6 +153,7 @@
     <module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
+    <module reference="6fd1293f-7f65-4ffd-99dc-4719eca7c171(jetbrains.mps.ide.vcs.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" version="0" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index 478ef5584f..6a12da4247 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -2336,6 +2336,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="2539ELhZEL$" role="3bR37C">
+          <node concept="3bR9La" id="2539ELhZEL_" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:39HJr_hyEzS" resolve="jetbrains.mps.ide.vcs.platform" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7B3y$vlfY21" role="2G$12L">
         <property role="BnDLt" value="true" />

From 7c13fe45aa4d7598309905bd410ddb441cec8544 Mon Sep 17 00:00:00 2001
From: Torsten Goerg <tgoerg@itemis.de>
Date: Thu, 18 Dec 2025 15:23:36 +0100
Subject: [PATCH 2/2] #1552: Executed 'Force Save All' within MPS.

---
 ...3.variability.featuremodel.base.editor.mps | 36 +++++++++----------
 ...riability.featuremodel.base.intentions.mps | 12 +++----
 2 files changed, 24 insertions(+), 24 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 8e83e43ff2..3a522a8bae 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
@@ -1253,7 +1253,7 @@
                 <node concept="3fqX7Q" id="2539ELgaDac" role="3clFbG">
                   <node concept="2ZW3vV" id="2539ELgaFeP" role="3fr31v">
                     <node concept="3uibUv" id="2539ELgaFnf" role="2ZW6by">
-                      <ref role="3uigEE" to="hdhb:42hl10VHay5" resolve="MainEditorComponent" />
+                      <ref role="3uigEE" to="hdhb:42hl10VHay5" resolve="DiffEditor.MainEditorComponent" />
                     </node>
                     <node concept="2OqwBi" id="2539ELgaDHj" role="2ZW6bz">
                       <node concept="1Q80Hx" id="2539ELgaDo2" role="2Oq$k0" />
@@ -1281,7 +1281,7 @@
                         <property role="TrG5h" value="group2ConstraintEntry" />
                         <node concept="2hMVRd" id="1BW0KPic_iq" role="1tU5fm">
                           <node concept="3uibUv" id="1BW0KPic_ir" role="2hN53Y">
-                            <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Entry" />
+                            <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Map.Entry" />
                             <node concept="3Tqbb2" id="1BW0KPic_is" role="11_B2D">
                               <ref role="ehGHo" to="s6b7:6OwVbfncU9A" resolve="ConstraintGroup" />
                             </node>
@@ -1299,7 +1299,7 @@
                           <node concept="2OqwBi" id="1BW0KPic_iw" role="37wK5m">
                             <node concept="pncrf" id="1BW0KPic_ix" role="2Oq$k0" />
                             <node concept="3Tsc0h" id="1BW0KPicAUN" role="2OqNvi">
-                              <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" />
+                              <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
                             </node>
                           </node>
                         </node>
@@ -1485,7 +1485,7 @@
                                   <node concept="2pJPED" id="5sXsnEdC8W0" role="2pJPEn">
                                     <ref role="2pJxaS" to="s6b7:6OwVbfnk$1s" resolve="ConstraintGroupAnnotation" />
                                     <node concept="2pIpSj" id="5sXsnEdCasT" role="2pJxcM">
-                                      <ref role="2pIpSl" to="s6b7:6OwVbfnqiC9" />
+                                      <ref role="2pIpSl" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
                                       <node concept="36biLy" id="5sXsnEdCaLK" role="28nt2d">
                                         <node concept="2OqwBi" id="5sXsnEdCcbK" role="36biLW">
                                           <node concept="2OqwBi" id="5sXsnEdCbQc" role="2Oq$k0">
@@ -1500,7 +1500,7 @@
                                               </node>
                                             </node>
                                             <node concept="3TrEf2" id="5sXsnEdCbWk" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
+                                              <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
                                             </node>
                                           </node>
                                           <node concept="1$rogu" id="5sXsnEdCcup" role="2OqNvi" />
@@ -1698,7 +1698,7 @@
                         <node concept="2OqwBi" id="1BW0KPicxnT" role="2Oq$k0">
                           <node concept="pncrf" id="1BW0KPicwXx" role="2Oq$k0" />
                           <node concept="3Tsc0h" id="1BW0KPicy7V" role="2OqNvi">
-                            <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" />
+                            <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
                           </node>
                         </node>
                         <node concept="2HwmR7" id="1BW0KPic$Fk" role="2OqNvi">
@@ -1719,11 +1719,11 @@
                                         </node>
                                       </node>
                                       <node concept="3TrEf2" id="1BW0KPic$Fv" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
+                                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="1BW0KPic$Fw" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" />
+                                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
                                     </node>
                                   </node>
                                   <node concept="3x8VRR" id="1BW0KPic$Fx" role="2OqNvi" />
@@ -1744,7 +1744,7 @@
               <node concept="2iRkQZ" id="6OwVbfnAoAg" role="2iSdaV" />
               <node concept="3F2HdR" id="4L$vDwV2VWe" role="3EZMnx">
                 <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
-                <ref role="1NtTu8" to="s6b7:4L$vDwV2mVd" />
+                <ref role="1NtTu8" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
                 <node concept="2iRkQZ" id="4L$vDwV2VWg" role="2czzBx" />
                 <node concept="107P5z" id="6OwVbfnEtQg" role="12AuX0">
                   <node concept="3clFbS" id="6OwVbfnEtQh" role="2VODD2">
@@ -1761,11 +1761,11 @@
                               </node>
                             </node>
                             <node concept="3TrEf2" id="6OwVbfnEvpm" role="2OqNvi">
-                              <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
+                              <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
                             </node>
                           </node>
                           <node concept="3TrEf2" id="6OwVbfnEvXI" role="2OqNvi">
-                            <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" />
+                            <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
                           </node>
                         </node>
                         <node concept="3w_OXm" id="6OwVbfnEwhN" role="2OqNvi" />
@@ -1797,7 +1797,7 @@
               <node concept="VPM3Z" id="2539ELgDv_H" role="3F10Kt" />
               <node concept="3XFhqQ" id="2539ELgDv_L" role="3EZMnx" />
               <node concept="3F2HdR" id="2539ELgq6Dd" role="3EZMnx">
-                <ref role="1NtTu8" to="s6b7:4L$vDwV2mVd" />
+                <ref role="1NtTu8" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
                 <node concept="2iRkQZ" id="2539ELgq6De" role="2czzBx" />
               </node>
               <node concept="2iRfu4" id="2539ELgDv_K" role="2iSdaV" />
@@ -11762,11 +11762,11 @@
                     <node concept="2OqwBi" id="2539ELi1Neo" role="2Oq$k0">
                       <node concept="pncrf" id="2539ELi1Nep" role="2Oq$k0" />
                       <node concept="3TrEf2" id="2539ELi1Neq" role="2OqNvi">
-                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
+                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
                       </node>
                     </node>
                     <node concept="3TrEf2" id="2539ELi1Ner" role="2OqNvi">
-                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" />
+                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
                     </node>
                   </node>
                   <node concept="2qgKlT" id="2539ELi1Nes" role="2OqNvi">
@@ -11819,11 +11819,11 @@
                     <node concept="2OqwBi" id="2539ELi1NML" role="2Oq$k0">
                       <node concept="pncrf" id="2539ELi1NMM" role="2Oq$k0" />
                       <node concept="3TrEf2" id="2539ELi1NMN" role="2OqNvi">
-                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" />
+                        <ref role="3Tt5mk" to="s6b7:6OwVbfnqiC9" resolve="groupRef" />
                       </node>
                     </node>
                     <node concept="3TrEf2" id="2539ELi1NMO" role="2OqNvi">
-                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" />
+                      <ref role="3Tt5mk" to="s6b7:6OwVbfnk$53" resolve="group" />
                     </node>
                   </node>
                   <node concept="2qgKlT" id="2539ELi1NMP" role="2OqNvi">
@@ -12859,7 +12859,7 @@
                     <node concept="2OqwBi" id="2539ELgaf2p" role="2Oq$k0">
                       <node concept="pncrf" id="2539ELgaf2q" role="2Oq$k0" />
                       <node concept="3Tsc0h" id="2539ELgaf2r" role="2OqNvi">
-                        <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" />
+                        <ref role="3TtcxE" to="s6b7:4L$vDwV2mVd" resolve="constraints" />
                       </node>
                     </node>
                     <node concept="34oBXx" id="2539ELgaf2s" role="2OqNvi" />
@@ -12924,7 +12924,7 @@
       </node>
       <node concept="1iCGBv" id="2539ELgaf2M" role="3EZMnx">
         <property role="1$x2rV" value="none" />
-        <ref role="1NtTu8" to="s6b7:6OwVbfncVTn" />
+        <ref role="1NtTu8" to="s6b7:6OwVbfncVTn" resolve="rootConstraintGrouping" />
         <ref role="1k5W1q" to="itrz:7Nu9WvXzjcf" resolve="iets3MuchSmaller" />
         <node concept="1sVBvm" id="2539ELgaf2N" role="1sWHZn">
           <node concept="3F0A7n" id="2539ELgaf2O" role="2wV5jI">
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 d063d5b8ca..45f177660b 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
@@ -7102,7 +7102,7 @@
                             <node concept="2OqwBi" id="2539ELhqsJh" role="2Oq$k0">
                               <node concept="2OqwBi" id="2539ELhqrU7" role="2Oq$k0">
                                 <node concept="37vLTw" id="2539ELhqrzx" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2539ELhqrsL" resolve="it" />
+                                  <ref role="3cqZAo" node="2539ELhqrsL" resolve="constraint" />
                                 </node>
                                 <node concept="3CFZ6_" id="2539ELhqsiE" role="2OqNvi">
                                   <node concept="3CFYIy" id="2539ELhqsrp" role="3CFYIz">
@@ -7157,7 +7157,7 @@
                                   <node concept="2OqwBi" id="2539ELhr4Wl" role="2Oq$k0">
                                     <node concept="2OqwBi" id="2539ELhr35O" role="2Oq$k0">
                                       <node concept="37vLTw" id="2539ELhr2se" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2539ELhqPoI" resolve="it" />
+                                        <ref role="3cqZAo" node="2539ELhqPoI" resolve="constraint" />
                                       </node>
                                       <node concept="3CFZ6_" id="2539ELhr4b1" role="2OqNvi">
                                         <node concept="3CFYIy" id="2539ELhr4vp" role="3CFYIz">
@@ -7182,7 +7182,7 @@
                                   <node concept="2OqwBi" id="2539ELhqQGl" role="2Oq$k0">
                                     <node concept="2OqwBi" id="2539ELhqPII" role="2Oq$k0">
                                       <node concept="37vLTw" id="2539ELhqPuI" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2539ELhqPoI" resolve="it" />
+                                        <ref role="3cqZAo" node="2539ELhqPoI" resolve="constraint" />
                                       </node>
                                       <node concept="3CFZ6_" id="2539ELhqQjn" role="2OqNvi">
                                         <node concept="3CFYIy" id="2539ELhqQr3" role="3CFYIz">
@@ -7218,14 +7218,14 @@
                   </node>
                 </node>
                 <node concept="37vLTw" id="2539ELhqGRu" role="37vLTJ">
-                  <ref role="3cqZAo" node="2539ELhqjzh" resolve="beforeSiblings" />
+                  <ref role="3cqZAo" node="2539ELhqjzh" resolve="beforeSibling" />
                 </node>
               </node>
             </node>
           </node>
           <node concept="2OqwBi" id="2539ELhqEDs" role="3clFbw">
             <node concept="37vLTw" id="2539ELhqEu4" role="2Oq$k0">
-              <ref role="3cqZAo" node="2539ELhqjzh" resolve="beforeSiblings" />
+              <ref role="3cqZAo" node="2539ELhqjzh" resolve="beforeSibling" />
             </node>
             <node concept="3w_OXm" id="2539ELhqFl2" role="2OqNvi" />
           </node>
@@ -7245,7 +7245,7 @@
               </node>
               <node concept="2Sf5sV" id="2539ELhrovR" role="37wK5m" />
               <node concept="37vLTw" id="2539ELhrozz" role="37wK5m">
-                <ref role="3cqZAo" node="2539ELhqjzh" resolve="beforeSiblings" />
+                <ref role="3cqZAo" node="2539ELhqjzh" resolve="beforeSibling" />
               </node>
             </node>
             <node concept="2JrnkZ" id="2539ELhro4l" role="2Oq$k0">