From 99d5397f265acbfe510a3aa837244edf43acd65c Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 9 Oct 2024 12:59:08 +0200
Subject: [PATCH 01/15] Add Caching mechanism (#2547)

---
 .../com.mbeddr.mpsutil.logicalChild.mpl       |   9 +-
 ...m.mbeddr.mpsutil.logicalChild.behavior.mps | 975 ++++++++++++++++--
 2 files changed, 921 insertions(+), 63 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
index 6836d446377..69582d7aa34 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.mpsutil.logicalChild" uuid="85a9bace-37a1-40af-956a-7bb1b081a77c" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -13,11 +13,12 @@
   <accessoryModels />
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
+    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:3eada220-3310-4fd3-b794-ff924add7d8a:com.mbeddr.mpsutil.smodule" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -55,8 +56,10 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="85a9bace-37a1-40af-956a-7bb1b081a77c(com.mbeddr.mpsutil.logicalChild)" version="0" />
+    <module reference="ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index f34bd1cb015..7a764e57162 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -4,15 +4,21 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <use id="3eada220-3310-4fd3-b794-ff924add7d8a" name="com.mbeddr.mpsutil.smodule" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="xxir" ref="r:a615bfc0-ceb2-486e-85b1-8debbfdfdbb6(com.mbeddr.mpsutil.logicalChild.structure)" implicit="true" />
+    <import index="xxir" ref="r:a615bfc0-ceb2-486e-85b1-8debbfdfdbb6(com.mbeddr.mpsutil.logicalChild.structure)" />
+    <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="87lp" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:io.vavr.collection(de.q60.mps.collections.libs/)" />
+    <import index="3o3z" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.google.common.collect(MPS.IDEA/)" />
+    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
+    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
+    <import index="17wx" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.locks(JDK/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -30,8 +36,16 @@
       <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -42,17 +56,29 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
       </concept>
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -62,6 +88,7 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -73,6 +100,9 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -80,20 +110,34 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
+      <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
+        <child id="1160998896846" name="condition" index="1gVkn0" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -114,17 +158,27 @@
       <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
         <property id="5858074156537516431" name="text" index="x79VB" />
       </concept>
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
+      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
+        <reference id="6832197706140518108" name="param" index="zr_51" />
+      </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
         <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
+        <property id="8465538089690881934" name="text" index="TUZQ4" />
+        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
+      </concept>
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
       <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -177,6 +231,14 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
+        <child id="1153944400369" name="variable" index="2Gsz3X" />
+        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
+      </concept>
+      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
+      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
+        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
+      </concept>
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
@@ -184,8 +246,14 @@
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
+      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
+      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
       <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" />
+      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
+        <child id="5686963296372573084" name="elementType" index="3O5elw" />
+      </concept>
     </language>
   </registry>
   <node concept="13h7C7" id="jksL7exwEV">
@@ -230,6 +298,17 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="3hmSi0TnTy5" role="13h7CS">
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="informsOwner" />
+      <node concept="3Tm1VV" id="3hmSi0TnTy6" role="1B3o_S" />
+      <node concept="10P_77" id="3hmSi0To5Xl" role="3clF45" />
+      <node concept="3clFbS" id="3hmSi0TnTy8" role="3clF47">
+        <node concept="3clFbF" id="3hmSi0To5Zp" role="3cqZAp">
+          <node concept="3clFbT" id="3hmSi0To5Zo" role="3clFbG" />
+        </node>
+      </node>
+    </node>
     <node concept="13hLZK" id="jksL7exwEW" role="13h7CW">
       <node concept="3clFbS" id="jksL7exwEX" role="2VODD2" />
     </node>
@@ -240,56 +319,33 @@
       <property role="TrG5h" value="findLogicalChildren" />
       <node concept="3Tm1VV" id="7c93VeVMIYW" role="1B3o_S" />
       <node concept="3clFbS" id="7c93VeVMIYY" role="3clF47">
-        <node concept="3cpWs8" id="5zdrv$9updl" role="3cqZAp">
-          <node concept="3cpWsn" id="5zdrv$9updo" role="3cpWs9">
-            <property role="TrG5h" value="children" />
-            <node concept="2I9FWS" id="5zdrv$9updk" role="1tU5fm">
-              <ref role="2I9WkF" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
-            </node>
-            <node concept="2ShNRf" id="5zdrv$9upej" role="33vP2m">
-              <node concept="2T8Vx0" id="5zdrv$9upSp" role="2ShVmc">
-                <node concept="2I9FWS" id="5zdrv$9upSr" role="2T96Bj">
-                  <ref role="2I9WkF" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5zdrv$9yRIE" role="3cqZAp">
-          <node concept="2OqwBi" id="5zdrv$9z21o" role="3clFbG">
-            <node concept="BsUDl" id="5zdrv$9yRID" role="2Oq$k0">
-              <ref role="37wK5l" node="5zdrv$9yRI_" resolve="getModelsWithLogicalChildren" />
-            </node>
-            <node concept="2es0OD" id="5zdrv$9z3Ih" role="2OqNvi">
-              <node concept="1bVj0M" id="5zdrv$9z3Ij" role="23t8la">
-                <node concept="3clFbS" id="5zdrv$9z3Ik" role="1bW5cS">
-                  <node concept="3clFbF" id="5zdrv$9z3Ma" role="3cqZAp">
-                    <node concept="2OqwBi" id="5zdrv$9z4V7" role="3clFbG">
-                      <node concept="37vLTw" id="5zdrv$9z3M9" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5zdrv$9updo" resolve="children" />
-                      </node>
-                      <node concept="X8dFx" id="jksL7exMBW" role="2OqNvi">
-                        <node concept="BsUDl" id="jksL7exMBY" role="25WWJ7">
-                          <ref role="37wK5l" node="5zdrv$9zA2z" resolve="findLogicalChildrenIn" />
-                          <node concept="37vLTw" id="jksL7exMBZ" role="37wK5m">
-                            <ref role="3cqZAo" node="5zdrv$9z3Il" resolve="model" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
+        <node concept="3clFbJ" id="7LqGxA8GoAt" role="3cqZAp">
+          <node concept="3clFbS" id="7LqGxA8GoAv" role="3clFbx">
+            <node concept="3cpWs6" id="6aYyEt1FD$0" role="3cqZAp">
+              <node concept="2YIFZM" id="6aYyEt1FEQ0" role="3cqZAk">
+                <ref role="37wK5l" node="6aYyEt1F6sz" resolve="findLogicalChildren" />
+                <ref role="1Pybhc" node="44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+                <node concept="13iPFW" id="6aYyEt1FF9_" role="37wK5m" />
+                <node concept="2OqwBi" id="6aYyEt1FGgj" role="37wK5m">
+                  <node concept="13iPFW" id="6aYyEt1FFLk" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="6aYyEt1FGHb" role="2OqNvi">
+                    <ref role="37wK5l" node="6aYyEt1EuYC" resolve="modulesWithLogicalChildren" />
                   </node>
                 </node>
-                <node concept="Rh6nW" id="5zdrv$9z3Il" role="1bW2Oz">
-                  <property role="TrG5h" value="model" />
-                  <node concept="2jxLKc" id="5zdrv$9z3Im" role="1tU5fm" />
-                </node>
               </node>
             </node>
           </node>
+          <node concept="2YIFZM" id="7LqGxA8Gs8m" role="3clFbw">
+            <ref role="37wK5l" node="7LqGxA8GqrF" resolve="shouldUseCache" />
+            <ref role="1Pybhc" node="44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+          </node>
         </node>
-        <node concept="3cpWs6" id="5zdrv$9upTw" role="3cqZAp">
-          <node concept="37vLTw" id="5zdrv$9upU7" role="3cqZAk">
-            <ref role="3cqZAo" node="5zdrv$9updo" resolve="children" />
+        <node concept="3clFbF" id="7LqGxA8CbMG" role="3cqZAp">
+          <node concept="2OqwBi" id="7LqGxA8CckM" role="3clFbG">
+            <node concept="13iPFW" id="7LqGxA8CbME" role="2Oq$k0" />
+            <node concept="2qgKlT" id="7LqGxA8CcG1" role="2OqNvi">
+              <ref role="37wK5l" node="7LqGxA8BBYW" resolve="directSearch" />
+            </node>
           </node>
         </node>
       </node>
@@ -342,21 +398,30 @@
                 <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
               </node>
             </node>
-            <node concept="2OqwBi" id="3kJ7$$rJIny" role="33vP2m">
-              <node concept="2OqwBi" id="3kJ7$$rJInz" role="2Oq$k0">
-                <node concept="liA8E" id="3kJ7$$rJIn$" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
-                </node>
-                <node concept="2JrnkZ" id="3kJ7$$rJIn_" role="2Oq$k0">
-                  <node concept="2OqwBi" id="3kJ7$$rJInA" role="2JrQYb">
-                    <node concept="13iPFW" id="3kJ7$$rJInB" role="2Oq$k0" />
-                    <node concept="I4A8Y" id="3kJ7$$rJInC" role="2OqNvi" />
+            <node concept="2OqwBi" id="6aYyEt1EBuu" role="33vP2m">
+              <node concept="BsUDl" id="6aYyEt1E_VR" role="2Oq$k0">
+                <ref role="37wK5l" node="6aYyEt1EuYC" resolve="modulesWithLogicalChildren" />
+              </node>
+              <node concept="3goQfb" id="6aYyEt1EDF0" role="2OqNvi">
+                <node concept="1bVj0M" id="6aYyEt1EDF2" role="23t8la">
+                  <node concept="3clFbS" id="6aYyEt1EDF3" role="1bW5cS">
+                    <node concept="3clFbF" id="6aYyEt1EEcW" role="3cqZAp">
+                      <node concept="2OqwBi" id="6aYyEt1EFEO" role="3clFbG">
+                        <node concept="37vLTw" id="6aYyEt1EEcV" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6aYyEt1EDF4" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="6aYyEt1EIaK" role="2OqNvi">
+                          <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="6aYyEt1EDF4" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="6aYyEt1EDF5" role="1tU5fm" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="3kJ7$$rJInD" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
-              </node>
             </node>
           </node>
         </node>
@@ -448,6 +513,55 @@
           <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
         </node>
       </node>
+      <node concept="P$JXv" id="6aYyEt2cNsq" role="lGtFl">
+        <node concept="TZ5HA" id="6aYyEt2cNsr" role="TZ5H$">
+          <node concept="1dT_AC" id="6aYyEt2cNss" role="1dT_Ay" />
+        </node>
+        <node concept="x79VA" id="6aYyEt2cNst" role="3nqlJM">
+          <property role="x79VB" value="modelsl where logical children are" />
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="6aYyEt1EuYC" role="13h7CS">
+      <property role="TrG5h" value="modulesWithLogicalChildren" />
+      <property role="13i0it" value="true" />
+      <node concept="3Tmbuc" id="6aYyEt1EJBJ" role="1B3o_S" />
+      <node concept="A3Dl8" id="6aYyEt1EwC9" role="3clF45">
+        <node concept="3uibUv" id="6aYyEt1EwCu" role="A3Ik2">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="6aYyEt1EuYF" role="3clF47">
+        <node concept="3clFbF" id="6aYyEt1ExK5" role="3cqZAp">
+          <node concept="2YIFZM" id="6aYyEt1ExNG" role="3clFbG">
+            <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
+            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+            <node concept="2OqwBi" id="6aYyEt1ExqY" role="37wK5m">
+              <node concept="2OqwBi" id="6aYyEt1Ex9I" role="2Oq$k0">
+                <node concept="2JrnkZ" id="6aYyEt1EwSr" role="2Oq$k0">
+                  <node concept="13iPFW" id="6aYyEt1EwRH" role="2JrQYb" />
+                </node>
+                <node concept="liA8E" id="6aYyEt1Exhb" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6aYyEt1ExC7" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="6aYyEt2cN3q" role="lGtFl">
+        <node concept="TZ5HA" id="6aYyEt2cN3r" role="TZ5H$">
+          <node concept="1dT_AC" id="6aYyEt2cN3s" role="1dT_Ay">
+            <property role="1dT_AB" value="Define modules where the logical children are" />
+          </node>
+        </node>
+        <node concept="x79VA" id="6aYyEt2cN3t" role="3nqlJM">
+          <property role="x79VB" value="moduels where the logical children are to be searched" />
+        </node>
+      </node>
     </node>
     <node concept="13i0hz" id="5zdrv$9zA2z" role="13h7CS">
       <property role="TrG5h" value="findLogicalChildrenIn" />
@@ -461,6 +575,7 @@
       <node concept="3clFbS" id="5zdrv$9zA29" role="3clF47">
         <node concept="3cpWs6" id="5zdrv$9zA2a" role="3cqZAp">
           <node concept="2OqwBi" id="5zdrv$anLnI" role="3cqZAk">
+            <node concept="ANE8D" id="5zdrv$anNhL" role="2OqNvi" />
             <node concept="2OqwBi" id="5zdrv$9zA2b" role="2Oq$k0">
               <node concept="2OqwBi" id="5zdrv$9zA2c" role="2Oq$k0">
                 <node concept="1eOMI4" id="5zdrv$9zA2d" role="2Oq$k0">
@@ -501,7 +616,6 @@
                 </node>
               </node>
             </node>
-            <node concept="ANE8D" id="5zdrv$anNhL" role="2OqNvi" />
           </node>
         </node>
       </node>
@@ -514,6 +628,747 @@
     <node concept="13hLZK" id="jksL7exBx0" role="13h7CW">
       <node concept="3clFbS" id="jksL7exBx1" role="2VODD2" />
     </node>
+    <node concept="13i0hz" id="7LqGxA8BBYW" role="13h7CS">
+      <property role="TrG5h" value="directSearch" />
+      <node concept="3Tm6S6" id="7LqGxA8BBYX" role="1B3o_S" />
+      <node concept="3vKaQO" id="7LqGxA8BU8d" role="3clF45">
+        <node concept="3Tqbb2" id="7LqGxA8BU8f" role="3O5elw">
+          <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7LqGxA8BBYx" role="3clF47">
+        <node concept="3cpWs8" id="7LqGxA8BBYy" role="3cqZAp">
+          <node concept="3cpWsn" id="7LqGxA8BBYz" role="3cpWs9">
+            <property role="TrG5h" value="children" />
+            <node concept="2I9FWS" id="7LqGxA8BBY$" role="1tU5fm">
+              <ref role="2I9WkF" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+            </node>
+            <node concept="2ShNRf" id="7LqGxA8BBY_" role="33vP2m">
+              <node concept="2T8Vx0" id="7LqGxA8BBYA" role="2ShVmc">
+                <node concept="2I9FWS" id="7LqGxA8BBYB" role="2T96Bj">
+                  <ref role="2I9WkF" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7LqGxA8BBYC" role="3cqZAp">
+          <node concept="2OqwBi" id="7LqGxA8BBYD" role="3clFbG">
+            <node concept="BsUDl" id="7LqGxA8BBYE" role="2Oq$k0">
+              <ref role="37wK5l" node="5zdrv$9yRI_" resolve="getModelsWithLogicalChildren" />
+            </node>
+            <node concept="2es0OD" id="7LqGxA8BBYF" role="2OqNvi">
+              <node concept="1bVj0M" id="7LqGxA8BBYG" role="23t8la">
+                <node concept="3clFbS" id="7LqGxA8BBYH" role="1bW5cS">
+                  <node concept="3clFbF" id="7LqGxA8BBYI" role="3cqZAp">
+                    <node concept="2OqwBi" id="7LqGxA8BBYJ" role="3clFbG">
+                      <node concept="37vLTw" id="7LqGxA8BBYK" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7LqGxA8BBYz" resolve="children" />
+                      </node>
+                      <node concept="X8dFx" id="7LqGxA8BBYL" role="2OqNvi">
+                        <node concept="BsUDl" id="7LqGxA8BBYM" role="25WWJ7">
+                          <ref role="37wK5l" node="5zdrv$9zA2z" resolve="findLogicalChildrenIn" />
+                          <node concept="37vLTw" id="7LqGxA8BBYN" role="37wK5m">
+                            <ref role="3cqZAo" node="7LqGxA8BBYO" resolve="model" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="7LqGxA8BBYO" role="1bW2Oz">
+                  <property role="TrG5h" value="model" />
+                  <node concept="2jxLKc" id="7LqGxA8BBYP" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="7LqGxA8BBYQ" role="3cqZAp">
+          <node concept="37vLTw" id="7LqGxA8BBYR" role="3cqZAk">
+            <ref role="3cqZAo" node="7LqGxA8BBYz" resolve="children" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="44INz$MLbE3">
+    <property role="TrG5h" value="LogicalChildOwnerUtil" />
+    <node concept="2tJIrI" id="7LqGxA8Cw8j" role="jymVt" />
+    <node concept="Wx3nA" id="44INz$MMr45" role="jymVt">
+      <property role="TrG5h" value="useCache" />
+      <node concept="10P_77" id="6aYyEt26VdI" role="1tU5fm" />
+      <node concept="3Tm6S6" id="6aYyEt1FNHL" role="1B3o_S" />
+      <node concept="3clFbT" id="6aYyEt26Wdb" role="33vP2m" />
+      <node concept="z59LJ" id="6aYyEt27M$Q" role="lGtFl">
+        <node concept="TZ5HA" id="6aYyEt27M$R" role="TZ5H$">
+          <node concept="1dT_AC" id="6aYyEt27M$S" role="1dT_Ay">
+            <property role="1dT_AB" value="Indicates if caching should be applied" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6aYyEt27NXn" role="jymVt" />
+    <node concept="Wx3nA" id="7LqGxA8AYpj" role="jymVt">
+      <property role="TrG5h" value="module2LogicalChildCache" />
+      <node concept="3uibUv" id="7LqGxA8AYxK" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+        <node concept="3uibUv" id="7LqGxA8AYzm" role="11_B2D">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+        <node concept="3uibUv" id="7LqGxA8FGGW" role="11_B2D">
+          <ref role="3uigEE" to="3o3z:~Multimap" resolve="Multimap" />
+          <node concept="3Tqbb2" id="7LqGxA8FGGX" role="11_B2D">
+            <ref role="ehGHo" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+          </node>
+          <node concept="3Tqbb2" id="7LqGxA8FGGY" role="11_B2D">
+            <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6aYyEt1FO6O" role="1B3o_S" />
+      <node concept="2ShNRf" id="6aYyEt25Xr6" role="33vP2m">
+        <node concept="1pGfFk" id="6aYyEt25Xr7" role="2ShVmc">
+          <property role="373rjd" value="true" />
+          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+        </node>
+      </node>
+      <node concept="z59LJ" id="6aYyEt27Qgm" role="lGtFl">
+        <node concept="TZ5HA" id="6aYyEt27Qgn" role="TZ5H$">
+          <node concept="1dT_AC" id="6aYyEt27Qgo" role="1dT_Ay">
+            <property role="1dT_AB" value="The data structure implementing the cache" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6aYyEt27RBu" role="jymVt" />
+    <node concept="Wx3nA" id="6aYyEt1EjIo" role="jymVt">
+      <property role="TrG5h" value="lock" />
+      <node concept="3uibUv" id="6aYyEt1EjIq" role="1tU5fm">
+        <ref role="3uigEE" to="17wx:~ReentrantLock" resolve="ReentrantLock" />
+      </node>
+      <node concept="2ShNRf" id="6aYyEt1EjIr" role="33vP2m">
+        <node concept="1pGfFk" id="6aYyEt1EjIs" role="2ShVmc">
+          <ref role="37wK5l" to="17wx:~ReentrantLock.&lt;init&gt;()" resolve="ReentrantLock" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6aYyEt1EjIt" role="1B3o_S" />
+      <node concept="z59LJ" id="6aYyEt27TUB" role="lGtFl">
+        <node concept="TZ5HA" id="6aYyEt27TUC" role="TZ5H$">
+          <node concept="1dT_AC" id="6aYyEt27TUD" role="1dT_Ay">
+            <property role="1dT_AB" value="To make this static class thread-safe we do locking" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7LqGxA8AZ1u" role="jymVt" />
+    <node concept="2tJIrI" id="7LqGxA8CBz9" role="jymVt" />
+    <node concept="2YIFZL" id="6aYyEt27Bpy" role="jymVt">
+      <property role="TrG5h" value="useCacheNow" />
+      <node concept="3clFbS" id="6aYyEt27BpA" role="3clF47">
+        <node concept="3clFbF" id="6aYyEt27BpB" role="3cqZAp">
+          <node concept="2OqwBi" id="6aYyEt27BpC" role="3clFbG">
+            <node concept="37vLTw" id="6aYyEt27BpD" role="2Oq$k0">
+              <ref role="3cqZAo" node="6aYyEt1EjIo" resolve="lock" />
+            </node>
+            <node concept="liA8E" id="6aYyEt27BpE" role="2OqNvi">
+              <ref role="37wK5l" to="17wx:~ReentrantLock.lock()" resolve="lock" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6aYyEt27BpF" role="3cqZAp">
+          <node concept="37vLTI" id="6aYyEt27BpG" role="3clFbG">
+            <node concept="3clFbT" id="6aYyEt27BpH" role="37vLTx">
+              <property role="3clFbU" value="true" />
+            </node>
+            <node concept="37vLTw" id="6aYyEt27BpI" role="37vLTJ">
+              <ref role="3cqZAo" node="44INz$MMr45" resolve="useCache" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6aYyEt27Bp$" role="3clF45" />
+      <node concept="3Tm1VV" id="6aYyEt27Bp_" role="1B3o_S" />
+      <node concept="P$JXv" id="6aYyEt27ViZ" role="lGtFl">
+        <node concept="TZ5HA" id="6aYyEt27Vj0" role="TZ5H$">
+          <node concept="1dT_AC" id="6aYyEt27Vj1" role="1dT_Ay">
+            <property role="1dT_AB" value="Indicates that caching should be used " />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6aYyEt270Jl" role="jymVt" />
+    <node concept="2YIFZL" id="6aYyEt27DQJ" role="jymVt">
+      <property role="TrG5h" value="stopUsingCache" />
+      <node concept="3clFbS" id="6aYyEt27DQN" role="3clF47">
+        <node concept="3clFbF" id="6aYyEt27DQO" role="3cqZAp">
+          <node concept="2OqwBi" id="6aYyEt27DQP" role="3clFbG">
+            <node concept="37vLTw" id="6aYyEt27DQQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="6aYyEt1EjIo" resolve="lock" />
+            </node>
+            <node concept="liA8E" id="6aYyEt27DQR" role="2OqNvi">
+              <ref role="37wK5l" to="17wx:~ReentrantLock.lock()" resolve="lock" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6aYyEt27DQS" role="3cqZAp">
+          <node concept="37vLTI" id="6aYyEt27DQT" role="3clFbG">
+            <node concept="3clFbT" id="6aYyEt27DQU" role="37vLTx">
+              <property role="3clFbU" value="true" />
+            </node>
+            <node concept="37vLTw" id="6aYyEt27DQV" role="37vLTJ">
+              <ref role="3cqZAo" node="44INz$MMr45" resolve="useCache" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6aYyEt27DQW" role="3cqZAp">
+          <node concept="2OqwBi" id="6aYyEt27DQX" role="3clFbG">
+            <node concept="37vLTw" id="6aYyEt27DQY" role="2Oq$k0">
+              <ref role="3cqZAo" node="7LqGxA8AYpj" resolve="module2LogicalChildCache" />
+            </node>
+            <node concept="liA8E" id="6aYyEt27DQZ" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.clear()" resolve="clear" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6aYyEt27DR0" role="3cqZAp">
+          <node concept="2OqwBi" id="6aYyEt27DR1" role="3clFbG">
+            <node concept="37vLTw" id="6aYyEt27DR2" role="2Oq$k0">
+              <ref role="3cqZAo" node="6aYyEt1EjIo" resolve="lock" />
+            </node>
+            <node concept="liA8E" id="6aYyEt27DR3" role="2OqNvi">
+              <ref role="37wK5l" to="17wx:~ReentrantLock.unlock()" resolve="unlock" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6aYyEt27DQL" role="3clF45" />
+      <node concept="3Tm1VV" id="6aYyEt27DQM" role="1B3o_S" />
+      <node concept="P$JXv" id="6aYyEt27WCY" role="lGtFl">
+        <node concept="TZ5HA" id="6aYyEt27WCZ" role="TZ5H$">
+          <node concept="1dT_AC" id="6aYyEt27WD0" role="1dT_Ay">
+            <property role="1dT_AB" value="Stops using the cache and clears it" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6aYyEt26M_t" role="jymVt" />
+    <node concept="2YIFZL" id="7LqGxA8GqrF" role="jymVt">
+      <property role="TrG5h" value="shouldUseCache" />
+      <node concept="3clFbS" id="7LqGxA8GqrJ" role="3clF47">
+        <node concept="3clFbF" id="6aYyEt2cdnr" role="3cqZAp">
+          <node concept="2OqwBi" id="6aYyEt2cdKw" role="3clFbG">
+            <node concept="37vLTw" id="6aYyEt2cdnp" role="2Oq$k0">
+              <ref role="3cqZAo" node="6aYyEt1EjIo" resolve="lock" />
+            </node>
+            <node concept="liA8E" id="6aYyEt2ce7l" role="2OqNvi">
+              <ref role="37wK5l" to="17wx:~ReentrantLock.lock()" resolve="lock" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7LqGxA8GqrK" role="3cqZAp">
+          <node concept="37vLTw" id="7LqGxA8GqrM" role="3clFbG">
+            <ref role="3cqZAo" node="44INz$MMr45" resolve="useCache" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="7LqGxA8Gt3c" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7LqGxA8CUGm" role="jymVt" />
+    <node concept="2YIFZL" id="6aYyEt1F6sz" role="jymVt">
+      <property role="TrG5h" value="findLogicalChildren" />
+      <node concept="37vLTG" id="6aYyEt1F7NS" role="3clF46">
+        <property role="TrG5h" value="owner" />
+        <node concept="3Tqbb2" id="6aYyEt1F8ml" role="1tU5fm">
+          <ref role="ehGHo" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6aYyEt1Feq6" role="3clF46">
+        <property role="TrG5h" value="scopeModules" />
+        <node concept="A3Dl8" id="6aYyEt1FeuB" role="1tU5fm">
+          <node concept="3uibUv" id="6aYyEt1FeuC" role="A3Ik2">
+            <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="6aYyEt1F6sB" role="3clF47">
+        <node concept="3clFbH" id="6aYyEt1FRWc" role="3cqZAp" />
+        <node concept="3clFbF" id="6aYyEt1EsJj" role="3cqZAp">
+          <node concept="2OqwBi" id="6aYyEt1EsJk" role="3clFbG">
+            <node concept="37vLTw" id="6aYyEt1FSbC" role="2Oq$k0">
+              <ref role="3cqZAo" node="6aYyEt1EjIo" resolve="lock" />
+            </node>
+            <node concept="liA8E" id="6aYyEt1EsJl" role="2OqNvi">
+              <ref role="37wK5l" to="17wx:~ReentrantLock.lock()" resolve="lock" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6aYyEt1FnTY" role="3cqZAp">
+          <node concept="2OqwBi" id="6aYyEt1F_jd" role="3clFbG">
+            <node concept="2OqwBi" id="6aYyEt1FoeH" role="2Oq$k0">
+              <node concept="37vLTw" id="6aYyEt1FnTX" role="2Oq$k0">
+                <ref role="3cqZAo" node="6aYyEt1Feq6" resolve="scopeModules" />
+              </node>
+              <node concept="3$u5V9" id="6aYyEt1FoOb" role="2OqNvi">
+                <node concept="1bVj0M" id="6aYyEt1FoOd" role="23t8la">
+                  <node concept="3clFbS" id="6aYyEt1FoOe" role="1bW5cS">
+                    <node concept="3clFbF" id="6aYyEt1F$EH" role="3cqZAp">
+                      <node concept="1rXfSq" id="6aYyEt1F$EG" role="3clFbG">
+                        <ref role="37wK5l" node="6aYyEt1Fmop" resolve="cacheFor" />
+                        <node concept="37vLTw" id="6aYyEt1F$VR" role="37wK5m">
+                          <ref role="3cqZAo" node="6aYyEt1FoOf" resolve="module" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="6aYyEt1FoOf" role="1bW2Oz">
+                    <property role="TrG5h" value="module" />
+                    <node concept="2jxLKc" id="6aYyEt1FoOg" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3goQfb" id="6aYyEt1FAax" role="2OqNvi">
+              <node concept="1bVj0M" id="6aYyEt1FAaz" role="23t8la">
+                <node concept="3clFbS" id="6aYyEt1FAa$" role="1bW5cS">
+                  <node concept="3clFbF" id="6aYyEt1FArd" role="3cqZAp">
+                    <node concept="2OqwBi" id="6aYyEt1FAAd" role="3clFbG">
+                      <node concept="37vLTw" id="6aYyEt1FArc" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6aYyEt1FAa_" resolve="it" />
+                      </node>
+                      <node concept="liA8E" id="6aYyEt1FAVL" role="2OqNvi">
+                        <ref role="37wK5l" to="3o3z:~Multimap.get(java.lang.Object)" resolve="get" />
+                        <node concept="37vLTw" id="6aYyEt1FBf3" role="37wK5m">
+                          <ref role="3cqZAo" node="6aYyEt1F7NS" resolve="owner" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="6aYyEt1FAa_" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="6aYyEt1FAaA" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="6aYyEt1F6s_" role="3clF45">
+        <node concept="3Tqbb2" id="6aYyEt1F6sA" role="A3Ik2">
+          <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+        </node>
+      </node>
+      <node concept="P$JXv" id="6aYyEt2cHqn" role="lGtFl">
+        <node concept="TZ5HA" id="6aYyEt2cHqo" role="TZ5H$">
+          <node concept="1dT_AC" id="6aYyEt2cHqp" role="1dT_Ay">
+            <property role="1dT_AB" value="For every 'ILogicalChildOwner' this method delivers its 'ILogicalChildren'. It will use the cache for " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="6aYyEt2cIa6" role="TZ5H$">
+          <node concept="1dT_AC" id="6aYyEt2cIa7" role="1dT_Ay">
+            <property role="1dT_AB" value="subsequent calls." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="6aYyEt2cHqq" role="3nqlJM">
+          <property role="TUZQ4" value="owns the children but does not know them" />
+          <node concept="zr_55" id="6aYyEt2cHqs" role="zr_5Q">
+            <ref role="zr_51" node="6aYyEt1F7NS" resolve="owner" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="6aYyEt2cHqt" role="3nqlJM">
+          <property role="TUZQ4" value="the modules where to find the children" />
+          <node concept="zr_55" id="6aYyEt2cHqv" role="zr_5Q">
+            <ref role="zr_51" node="6aYyEt1Feq6" resolve="scopeModules" />
+          </node>
+        </node>
+        <node concept="x79VA" id="6aYyEt2cHqw" role="3nqlJM">
+          <property role="x79VB" value="children of owner" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6aYyEt2ct1G" role="jymVt" />
+    <node concept="2YIFZL" id="7LqGxA8Bh$M" role="jymVt">
+      <property role="TrG5h" value="createCacheFor" />
+      <node concept="3clFbS" id="7LqGxA8Bh$S" role="3clF47">
+        <node concept="2Gpval" id="7LqGxA8CNo_" role="3cqZAp">
+          <node concept="2GrKxI" id="7LqGxA8CNoB" role="2Gsz3X">
+            <property role="TrG5h" value="module" />
+          </node>
+          <node concept="37vLTw" id="7LqGxA8CQbG" role="2GsD0m">
+            <ref role="3cqZAo" node="7LqGxA8Bh$O" resolve="modules" />
+          </node>
+          <node concept="3clFbS" id="7LqGxA8CNoF" role="2LFqv$">
+            <node concept="3cpWs8" id="7LqGxA8Fasa" role="3cqZAp">
+              <node concept="3cpWsn" id="7LqGxA8Fasb" role="3cpWs9">
+                <property role="TrG5h" value="owner2childen" />
+                <node concept="3uibUv" id="7LqGxA8F9Z4" role="1tU5fm">
+                  <ref role="3uigEE" to="3o3z:~Multimap" resolve="Multimap" />
+                  <node concept="3Tqbb2" id="7LqGxA8F9Za" role="11_B2D">
+                    <ref role="ehGHo" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+                  </node>
+                  <node concept="3Tqbb2" id="7LqGxA8F9Z9" role="11_B2D">
+                    <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="7LqGxA8FTNN" role="33vP2m">
+                  <node concept="37vLTw" id="7LqGxA8FTbv" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7LqGxA8AYpj" resolve="module2LogicalChildCache" />
+                  </node>
+                  <node concept="liA8E" id="7LqGxA8FVmk" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                    <node concept="2GrUjf" id="7LqGxA8FVVr" role="37wK5m">
+                      <ref role="2Gs0qQ" node="7LqGxA8CNoB" resolve="module" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="7LqGxA8FX3p" role="3cqZAp">
+              <node concept="3clFbS" id="7LqGxA8FX3r" role="3clFbx">
+                <node concept="3SKdUt" id="6aYyEt28gK9" role="3cqZAp">
+                  <node concept="1PaTwC" id="6aYyEt28gKa" role="1aUNEU">
+                    <node concept="3oM_SD" id="6aYyEt28hL6" role="1PaTwD">
+                      <property role="3oM_SC" value="Create" />
+                    </node>
+                    <node concept="3oM_SD" id="6aYyEt28hL9" role="1PaTwD">
+                      <property role="3oM_SC" value="map" />
+                    </node>
+                    <node concept="3oM_SD" id="6aYyEt28hLe" role="1PaTwD">
+                      <property role="3oM_SC" value="if" />
+                    </node>
+                    <node concept="3oM_SD" id="6aYyEt28hLl" role="1PaTwD">
+                      <property role="3oM_SC" value="not" />
+                    </node>
+                    <node concept="3oM_SD" id="6aYyEt28hLu" role="1PaTwD">
+                      <property role="3oM_SC" value="present" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="7LqGxA9aLEX" role="3cqZAp">
+                  <node concept="37vLTI" id="7LqGxA9aMyx" role="3clFbG">
+                    <node concept="2YIFZM" id="7LqGxA9aONd" role="37vLTx">
+                      <ref role="37wK5l" to="3o3z:~HashMultimap.create()" resolve="create" />
+                      <ref role="1Pybhc" to="3o3z:~HashMultimap" resolve="HashMultimap" />
+                    </node>
+                    <node concept="37vLTw" id="7LqGxA9aLEV" role="37vLTJ">
+                      <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="owner2childen" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="7LqGxA8FZ5N" role="3cqZAp">
+                  <node concept="2OqwBi" id="7LqGxA8G0c9" role="3clFbG">
+                    <node concept="37vLTw" id="7LqGxA8FZ5L" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7LqGxA8AYpj" resolve="module2LogicalChildCache" />
+                    </node>
+                    <node concept="liA8E" id="7LqGxA8G1WP" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
+                      <node concept="2GrUjf" id="7LqGxA8G2Av" role="37wK5m">
+                        <ref role="2Gs0qQ" node="7LqGxA8CNoB" resolve="module" />
+                      </node>
+                      <node concept="37vLTw" id="7LqGxA8GccU" role="37wK5m">
+                        <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="bufferMultimap" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbC" id="7LqGxA8FYae" role="3clFbw">
+                <node concept="10Nm6u" id="7LqGxA8FYE4" role="3uHU7w" />
+                <node concept="37vLTw" id="7LqGxA8FX_R" role="3uHU7B">
+                  <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="bufferMultimap" />
+                </node>
+              </node>
+            </node>
+            <node concept="2Gpval" id="7LqGxA8CLo$" role="3cqZAp">
+              <node concept="2GrKxI" id="7LqGxA8CLo_" role="2Gsz3X">
+                <property role="TrG5h" value="model" />
+              </node>
+              <node concept="2OqwBi" id="7LqGxA8CRCC" role="2GsD0m">
+                <node concept="2GrUjf" id="7LqGxA8CRsB" role="2Oq$k0">
+                  <ref role="2Gs0qQ" node="7LqGxA8CNoB" resolve="module" />
+                </node>
+                <node concept="liA8E" id="7LqGxA8CRUA" role="2OqNvi">
+                  <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="7LqGxA8CLoB" role="2LFqv$">
+                <node concept="3cpWs8" id="7LqGxA8CSui" role="3cqZAp">
+                  <node concept="3cpWsn" id="7LqGxA8CSuj" role="3cpWs9">
+                    <property role="TrG5h" value="model2" />
+                    <node concept="H_c77" id="7LqGxA8CSGg" role="1tU5fm" />
+                    <node concept="2GrUjf" id="7LqGxA8CSuk" role="33vP2m">
+                      <ref role="2Gs0qQ" node="7LqGxA8CLo_" resolve="model" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="7LqGxA8CLoC" role="3cqZAp">
+                  <node concept="2OqwBi" id="7LqGxA8CLoD" role="3clFbG">
+                    <node concept="2OqwBi" id="7LqGxA8CLoE" role="2Oq$k0">
+                      <node concept="37vLTw" id="7LqGxA8CT6p" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7LqGxA8CSuj" resolve="model2" />
+                      </node>
+                      <node concept="2SmgA7" id="7LqGxA8CLoG" role="2OqNvi">
+                        <node concept="chp4Y" id="7LqGxA8CLoH" role="1dBWTz">
+                          <ref role="cht4Q" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2es0OD" id="7LqGxA8CLoI" role="2OqNvi">
+                      <node concept="1bVj0M" id="7LqGxA8CLoJ" role="23t8la">
+                        <node concept="3clFbS" id="7LqGxA8CLoK" role="1bW5cS">
+                          <node concept="3cpWs8" id="7LqGxA8CLoL" role="3cqZAp">
+                            <node concept="3cpWsn" id="7LqGxA8CLoM" role="3cpWs9">
+                              <property role="TrG5h" value="owner" />
+                              <node concept="3Tqbb2" id="7LqGxA8CLoN" role="1tU5fm">
+                                <ref role="ehGHo" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+                              </node>
+                              <node concept="2OqwBi" id="7LqGxA8CLoO" role="33vP2m">
+                                <node concept="37vLTw" id="7LqGxA8CLoP" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7LqGxA8CLoW" resolve="child" />
+                                </node>
+                                <node concept="2qgKlT" id="7LqGxA8CLoQ" role="2OqNvi">
+                                  <ref role="37wK5l" node="7c93VeVMBwo" resolve="getOwner" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbJ" id="7LqGxA8CLoR" role="3cqZAp">
+                            <node concept="3clFbS" id="7LqGxA8CLoS" role="3clFbx">
+                              <node concept="3SKdUt" id="6aYyEt28iGB" role="3cqZAp">
+                                <node concept="1PaTwC" id="6aYyEt28iGC" role="1aUNEU">
+                                  <node concept="3oM_SD" id="6aYyEt28j_g" role="1PaTwD">
+                                    <property role="3oM_SC" value="Adds" />
+                                  </node>
+                                  <node concept="3oM_SD" id="6aYyEt28ksj" role="1PaTwD">
+                                    <property role="3oM_SC" value="the" />
+                                  </node>
+                                  <node concept="3oM_SD" id="6aYyEt28plR" role="1PaTwD">
+                                    <property role="3oM_SC" value="owner-child-relation" />
+                                  </node>
+                                  <node concept="3oM_SD" id="6aYyEt28qcY" role="1PaTwD">
+                                    <property role="3oM_SC" value="to" />
+                                  </node>
+                                  <node concept="3oM_SD" id="6aYyEt28r47" role="1PaTwD">
+                                    <property role="3oM_SC" value="the" />
+                                  </node>
+                                  <node concept="3oM_SD" id="6aYyEt28rVi" role="1PaTwD">
+                                    <property role="3oM_SC" value="cache" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="7LqGxA8Fdip" role="3cqZAp">
+                                <node concept="2OqwBi" id="7LqGxA8FdSO" role="3clFbG">
+                                  <node concept="37vLTw" id="7LqGxA8Fdio" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="bufferMultimap" />
+                                  </node>
+                                  <node concept="liA8E" id="7LqGxA8FeHR" role="2OqNvi">
+                                    <ref role="37wK5l" to="3o3z:~Multimap.put(java.lang.Object,java.lang.Object)" resolve="put" />
+                                    <node concept="37vLTw" id="7LqGxA8FfiC" role="37wK5m">
+                                      <ref role="3cqZAo" node="7LqGxA8CLoM" resolve="owner" />
+                                    </node>
+                                    <node concept="37vLTw" id="7LqGxA8Fgkr" role="37wK5m">
+                                      <ref role="3cqZAo" node="7LqGxA8CLoW" resolve="child" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3y3z36" id="7LqGxA8CLoT" role="3clFbw">
+                              <node concept="10Nm6u" id="7LqGxA8CLoU" role="3uHU7w" />
+                              <node concept="37vLTw" id="7LqGxA8CLoV" role="3uHU7B">
+                                <ref role="3cqZAo" node="7LqGxA8CLoM" resolve="owner" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="7LqGxA8CLoW" role="1bW2Oz">
+                          <property role="TrG5h" value="child" />
+                          <node concept="2jxLKc" id="7LqGxA8CLoX" role="1tU5fm" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7LqGxA8Bh$Q" role="3clF45" />
+      <node concept="37vLTG" id="7LqGxA8Bh$O" role="3clF46">
+        <property role="TrG5h" value="modules" />
+        <node concept="3vKaQO" id="7LqGxA8CGQs" role="1tU5fm">
+          <node concept="3uibUv" id="7LqGxA8CGQt" role="3O5elw">
+            <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6aYyEt1FPNb" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7LqGxA8Bdpt" role="jymVt" />
+    <node concept="2tJIrI" id="6aYyEt1FkVN" role="jymVt" />
+    <node concept="2YIFZL" id="6aYyEt1Fmop" role="jymVt">
+      <property role="TrG5h" value="cacheFor" />
+      <node concept="3clFbS" id="6aYyEt1Fmot" role="3clF47">
+        <node concept="3cpWs8" id="6aYyEt1Fp7C" role="3cqZAp">
+          <node concept="3cpWsn" id="6aYyEt1Fp7D" role="3cpWs9">
+            <property role="TrG5h" value="logicalChildrenCacheMaybe" />
+            <node concept="3uibUv" id="6aYyEt1FoYw" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+              <node concept="3uibUv" id="6aYyEt28xux" role="11_B2D">
+                <ref role="3uigEE" to="3o3z:~Multimap" resolve="Multimap" />
+                <node concept="3Tqbb2" id="6aYyEt28xuy" role="11_B2D">
+                  <ref role="ehGHo" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+                </node>
+                <node concept="3Tqbb2" id="6aYyEt28xuz" role="11_B2D">
+                  <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                </node>
+              </node>
+            </node>
+            <node concept="2YIFZM" id="6aYyEt1Fp7E" role="33vP2m">
+              <ref role="37wK5l" node="7LqGxA8Bhbr" resolve="getLogicalChildrenCache" />
+              <ref role="1Pybhc" node="44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+              <node concept="37vLTw" id="6aYyEt1Fp7F" role="37wK5m">
+                <ref role="3cqZAo" node="6aYyEt1Fmor" resolve="module" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="6aYyEt1FpZu" role="3cqZAp">
+          <node concept="3clFbS" id="6aYyEt1FpZw" role="3clFbx">
+            <node concept="3clFbF" id="6aYyEt1Fu4t" role="3cqZAp">
+              <node concept="1rXfSq" id="6aYyEt1Fu4s" role="3clFbG">
+                <ref role="37wK5l" node="7LqGxA8Bh$M" resolve="createCacheFor" />
+                <node concept="2YIFZM" id="6aYyEt1FvkN" role="37wK5m">
+                  <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
+                  <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                  <node concept="37vLTw" id="6aYyEt1FvEV" role="37wK5m">
+                    <ref role="3cqZAo" node="6aYyEt1Fmor" resolve="module" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="6aYyEt1FwgL" role="3cqZAp">
+              <node concept="37vLTI" id="6aYyEt1FxkY" role="3clFbG">
+                <node concept="37vLTw" id="6aYyEt1FwgJ" role="37vLTJ">
+                  <ref role="3cqZAo" node="6aYyEt1Fp7D" resolve="logicalChildrenCacheMaybe" />
+                </node>
+                <node concept="1rXfSq" id="6aYyEt2cDxl" role="37vLTx">
+                  <ref role="37wK5l" node="7LqGxA8Bhbr" resolve="logicalChildrenCache" />
+                  <node concept="37vLTw" id="6aYyEt1Fxy$" role="37wK5m">
+                    <ref role="3cqZAo" node="6aYyEt1Fmor" resolve="module" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1gVbGN" id="6aYyEt1Fytq" role="3cqZAp">
+              <node concept="2OqwBi" id="6aYyEt1Fzhz" role="1gVkn0">
+                <node concept="37vLTw" id="6aYyEt1FyTe" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6aYyEt1Fp7D" resolve="logicalChildrenCacheMaybe" />
+                </node>
+                <node concept="liA8E" id="6aYyEt1FzVp" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~Optional.isPresent()" resolve="isPresent" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3fqX7Q" id="6aYyEt1Ft1w" role="3clFbw">
+            <node concept="2OqwBi" id="6aYyEt1Ft1y" role="3fr31v">
+              <node concept="37vLTw" id="6aYyEt1Ft1z" role="2Oq$k0">
+                <ref role="3cqZAo" node="6aYyEt1Fp7D" resolve="logicalChildrenCacheMaybe" />
+              </node>
+              <node concept="liA8E" id="6aYyEt1Ft1$" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Optional.isPresent()" resolve="isPresent" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="6aYyEt1Fmou" role="3cqZAp">
+          <node concept="2OqwBi" id="6aYyEt1FtgS" role="3cqZAk">
+            <node concept="37vLTw" id="6aYyEt1Fp7G" role="2Oq$k0">
+              <ref role="3cqZAo" node="6aYyEt1Fp7D" resolve="logicalChildrenCacheMaybe" />
+            </node>
+            <node concept="liA8E" id="6aYyEt1Ft_u" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6aYyEt1Fmor" role="3clF46">
+        <property role="TrG5h" value="module" />
+        <node concept="3uibUv" id="6aYyEt1Fmos" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6aYyEt1Fmoz" role="1B3o_S" />
+      <node concept="3uibUv" id="6aYyEt28y2n" role="3clF45">
+        <ref role="3uigEE" to="3o3z:~Multimap" resolve="Multimap" />
+        <node concept="3Tqbb2" id="6aYyEt28y2o" role="11_B2D">
+          <ref role="ehGHo" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+        </node>
+        <node concept="3Tqbb2" id="6aYyEt28y2p" role="11_B2D">
+          <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6aYyEt2cAKQ" role="jymVt" />
+    <node concept="2YIFZL" id="7LqGxA8Bhbr" role="jymVt">
+      <property role="TrG5h" value="logicalChildrenCache" />
+      <node concept="3clFbS" id="7LqGxA8Bhbx" role="3clF47">
+        <node concept="3clFbF" id="7LqGxA8Bhby" role="3cqZAp">
+          <node concept="2YIFZM" id="7LqGxA8BvZW" role="3clFbG">
+            <ref role="37wK5l" to="33ny:~Optional.ofNullable(java.lang.Object)" resolve="ofNullable" />
+            <ref role="1Pybhc" to="33ny:~Optional" resolve="Optional" />
+            <node concept="2OqwBi" id="7LqGxA8BvZX" role="37wK5m">
+              <node concept="37vLTw" id="7LqGxA8BvZY" role="2Oq$k0">
+                <ref role="3cqZAo" node="7LqGxA8AYpj" resolve="module2LogicalChildCache" />
+              </node>
+              <node concept="liA8E" id="7LqGxA8BvZZ" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                <node concept="37vLTw" id="7LqGxA8Bw00" role="37wK5m">
+                  <ref role="3cqZAo" node="7LqGxA8Bhbt" resolve="module" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7LqGxA8Bhbt" role="3clF46">
+        <property role="TrG5h" value="module" />
+        <node concept="3uibUv" id="7LqGxA8Bhbu" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6aYyEt1FLZQ" role="1B3o_S" />
+      <node concept="3uibUv" id="7LqGxA8BvOj" role="3clF45">
+        <ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
+        <node concept="3uibUv" id="7LqGxA8FLV9" role="11_B2D">
+          <ref role="3uigEE" to="3o3z:~Multimap" resolve="Multimap" />
+          <node concept="3Tqbb2" id="7LqGxA8FLVa" role="11_B2D">
+            <ref role="ehGHo" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+          </node>
+          <node concept="3Tqbb2" id="7LqGxA8FLVb" role="11_B2D">
+            <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="44INz$MLbE4" role="1B3o_S" />
+    <node concept="3UR2Jj" id="6aYyEt26oxW" role="lGtFl">
+      <node concept="TZ5HA" id="6aYyEt26oxX" role="TZ5H$">
+        <node concept="1dT_AC" id="6aYyEt26oxY" role="1dT_Ay">
+          <property role="1dT_AB" value="This class can be used by algorithms to speed the finding of 'LocgicalChildren' of 'ILogicalCHildOwners' using " />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="6aYyEt26qyv" role="TZ5H$">
+        <node concept="1dT_AC" id="6aYyEt26qyw" role="1dT_Ay">
+          <property role="1dT_AB" value="a caching mechanism" />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 

From c32d814a74f430aeb4f2117ae429c2080e75ebff Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 9 Oct 2024 16:20:45 +0200
Subject: [PATCH 02/15] set flag the right way (#2547)

---
 .../com.mbeddr.mpsutil.logicalChild.mpl                  | 2 --
 .../models/com.mbeddr.mpsutil.logicalChild.behavior.mps  | 9 ++-------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
index 69582d7aa34..66f265e63da 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
@@ -14,7 +14,6 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
@@ -59,7 +58,6 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="85a9bace-37a1-40af-956a-7bb1b081a77c(com.mbeddr.mpsutil.logicalChild)" version="0" />
-    <module reference="ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index 7a764e57162..f1c25f5ce7e 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -11,13 +11,10 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="xxir" ref="r:a615bfc0-ceb2-486e-85b1-8debbfdfdbb6(com.mbeddr.mpsutil.logicalChild.structure)" />
-    <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="87lp" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:io.vavr.collection(de.q60.mps.collections.libs/)" />
     <import index="3o3z" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.google.common.collect(MPS.IDEA/)" />
-    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
-    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="17wx" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.locks(JDK/)" />
+    <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -813,9 +810,7 @@
         </node>
         <node concept="3clFbF" id="6aYyEt27DQS" role="3cqZAp">
           <node concept="37vLTI" id="6aYyEt27DQT" role="3clFbG">
-            <node concept="3clFbT" id="6aYyEt27DQU" role="37vLTx">
-              <property role="3clFbU" value="true" />
-            </node>
+            <node concept="3clFbT" id="6aYyEt27DQU" role="37vLTx" />
             <node concept="37vLTw" id="6aYyEt27DQV" role="37vLTJ">
               <ref role="3cqZAo" node="44INz$MMr45" resolve="useCache" />
             </node>

From 488a38d7ffaf43ab767f28d460d9e89f97902d28 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 10 Oct 2024 08:04:18 +0200
Subject: [PATCH 03/15] fix build solution (#2547)

---
 .../com.mbeddr.mpsutil.logicalChild.mpl                         | 2 +-
 .../models/com.mbeddr.mpsutil.logicalChild.behavior.mps         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
index 66f265e63da..8327432a036 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
@@ -14,8 +14,8 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index f1c25f5ce7e..239aa506489 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -14,7 +14,6 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="3o3z" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.google.common.collect(MPS.IDEA/)" />
     <import index="17wx" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.locks(JDK/)" />
-    <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>

From 1b3c70865475fec1fdeb0f896953f2b08fc37bea Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 10 Oct 2024 08:04:34 +0200
Subject: [PATCH 04/15] fix build solution (#2547)

---
 .../models/com/mbeddr/platform/build.mps          | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index 914ece6d071..e2ee7654303 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -20168,11 +20168,6 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="3lcj7hzsBNN" role="3bR37C">
-          <node concept="3bR9La" id="3lcj7hzsBNO" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
         <node concept="1BupzO" id="3lcj7hzsBO0" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -20211,6 +20206,16 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5bVx5KEQpYM" role="3bR37C">
+          <node concept="3bR9La" id="5bVx5KEQpYN" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5bVx5KEQpYO" role="3bR37C">
+          <node concept="3bR9La" id="5bVx5KEQpYP" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="3lcj7hzsuXf" role="3989C9">

From 4253d8e111fc519ac1b6804d5daf9d11f85ea85b Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 10 Oct 2024 11:05:41 +0200
Subject: [PATCH 05/15] running 'migrate/remigrate' (#2547)

---
 .../com.mbeddr.mpsutil.logicalChild.behavior.mps   |  8 ++++----
 subprojects/com.mbeddr/build.gradle                | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index 239aa506489..7dfa08ee8fd 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -1063,7 +1063,7 @@
                         <ref role="2Gs0qQ" node="7LqGxA8CNoB" resolve="module" />
                       </node>
                       <node concept="37vLTw" id="7LqGxA8GccU" role="37wK5m">
-                        <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="bufferMultimap" />
+                        <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="owner2childen" />
                       </node>
                     </node>
                   </node>
@@ -1072,7 +1072,7 @@
               <node concept="3clFbC" id="7LqGxA8FYae" role="3clFbw">
                 <node concept="10Nm6u" id="7LqGxA8FYE4" role="3uHU7w" />
                 <node concept="37vLTw" id="7LqGxA8FX_R" role="3uHU7B">
-                  <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="bufferMultimap" />
+                  <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="owner2childen" />
                 </node>
               </node>
             </node>
@@ -1156,7 +1156,7 @@
                               <node concept="3clFbF" id="7LqGxA8Fdip" role="3cqZAp">
                                 <node concept="2OqwBi" id="7LqGxA8FdSO" role="3clFbG">
                                   <node concept="37vLTw" id="7LqGxA8Fdio" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="bufferMultimap" />
+                                    <ref role="3cqZAo" node="7LqGxA8Fasb" resolve="owner2childen" />
                                   </node>
                                   <node concept="liA8E" id="7LqGxA8FeHR" role="2OqNvi">
                                     <ref role="37wK5l" to="3o3z:~Multimap.put(java.lang.Object,java.lang.Object)" resolve="put" />
@@ -1223,7 +1223,7 @@
               </node>
             </node>
             <node concept="2YIFZM" id="6aYyEt1Fp7E" role="33vP2m">
-              <ref role="37wK5l" node="7LqGxA8Bhbr" resolve="getLogicalChildrenCache" />
+              <ref role="37wK5l" node="7LqGxA8Bhbr" resolve="logicalChildrenCache" />
               <ref role="1Pybhc" node="44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
               <node concept="37vLTw" id="6aYyEt1Fp7F" role="37wK5m">
                 <ref role="3cqZAo" node="6aYyEt1Fmor" resolve="module" />
diff --git a/subprojects/com.mbeddr/build.gradle b/subprojects/com.mbeddr/build.gradle
index fffe957f701..b8111a8f9db 100755
--- a/subprojects/com.mbeddr/build.gradle
+++ b/subprojects/com.mbeddr/build.gradle
@@ -1,10 +1,16 @@
 import de.itemis.mps.gradle.tasks.MpsMigrate
 import de.itemis.mps.gradle.tasks.Remigrate
+import de.itemis.mps.gradle.downloadJBR.DownloadJbrForPlatform
 
 plugins {
     id 'de.itemis.mps.gradle.common'
 }
 
+apply plugin: 'download-jbr'
+
+downloadJbr {
+    jbrVersion = '17.0.8.1-b1000.32'
+}
 // path variables
 // If mpsHomeDir is set explicitly, skip the MPS resolution step and use the explicit path (which may be relative from
 // the root directory).
@@ -191,7 +197,9 @@ List<File> projectDirectoriesInDependencyOrder = projectsInDependencyOrder.colle
 }
 
 tasks.register('migrate', MpsMigrate) {
-    dependsOn(':com.mbeddr:platform:generate_platform_languages')
+    dependsOn(':com.mbeddr:platform:generate_platform_languages', 'downloadJbr')
+    javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
+
     mpsHome = mpsHomeDir
     projectDirectories.from(projectDirectoriesInDependencyOrder)
 
@@ -203,7 +211,9 @@ tasks.register('migrate', MpsMigrate) {
 }
 
 tasks.register('remigrate', Remigrate) {
-    dependsOn(':com.mbeddr:platform:generate_platform_languages')
+    dependsOn(':com.mbeddr:platform:generate_platform_languages', 'downloadJbr')
+    javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
+
     mpsHome = mpsHomeDir
     projectDirectories.from(projectDirectoriesInDependencyOrder)
 

From 8a53ae3205f68e09a35d1c24932bd68db9a9815e Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 10 Oct 2024 13:39:07 +0200
Subject: [PATCH 06/15] Adds test for cache of ILogicalChildren (#2547)

---
 .../com.mbeddr.mpsutil/.mps/modules.xml       |   1 +
 .../com.mbeddr.mpsutil.logicalChild.mpl       |   1 +
 ...m.mbeddr.mpsutil.logicalChild.behavior.mps |  49 +-
 ...ogicalChild.sandbox.sandbox.testbuffer.mps |   8 +
 ...mbeddr.mpsutil.logicalChild.test@tests.mps | 799 ++++++++++++++++++
 .../test.com.mbeddr.mpsutil.logicalChild.msd  |  45 +
 6 files changed, 890 insertions(+), 13 deletions(-)
 create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.testbuffer.mps
 create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
 create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd

diff --git a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml
index 74926eb7f56..33ed59ba987 100644
--- a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml
+++ b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml
@@ -186,6 +186,7 @@
       <modulePath path="$PROJECT_DIR$/solutions/org.apache.batik/org.apache.batik.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/org.mockito/org.mockito.msd" folder="stubs" />
       <modulePath path="$PROJECT_DIR$/solutions/org.xml/org.xml.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd" folder="logicalChild" />
       <modulePath path="$PROJECT_DIR$/tests/com.mbeddr.mpsutil.compare.pattern.test/com.mbeddr.mpsutil.compare.pattern.test.msd" folder="staging.comparator" />
       <modulePath path="$PROJECT_DIR$/tests/com.mbeddr.mpsutil.javainterpreter.test/com.mbeddr.mpsutil.javainterpreter.test.mpl" folder="staging.javainterpreter" />
       <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.asynccell/test.com.mbeddr.mpsutil.asynccell.msd" folder="asynccell" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
index 8327432a036..472a073b424 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
@@ -19,6 +19,7 @@
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index 7dfa08ee8fd..233b8cc0abb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -5,6 +5,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -14,6 +15,7 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="3o3z" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.google.common.collect(MPS.IDEA/)" />
     <import index="17wx" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.locks(JDK/)" />
+    <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -119,6 +121,7 @@
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
+        <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
@@ -144,6 +147,9 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
+    <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
+      <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
+    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -528,21 +534,38 @@
         </node>
       </node>
       <node concept="3clFbS" id="6aYyEt1EuYF" role="3clF47">
-        <node concept="3clFbF" id="6aYyEt1ExK5" role="3cqZAp">
-          <node concept="2YIFZM" id="6aYyEt1ExNG" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
-            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-            <node concept="2OqwBi" id="6aYyEt1ExqY" role="37wK5m">
-              <node concept="2OqwBi" id="6aYyEt1Ex9I" role="2Oq$k0">
-                <node concept="2JrnkZ" id="6aYyEt1EwSr" role="2Oq$k0">
-                  <node concept="13iPFW" id="6aYyEt1EwRH" role="2JrQYb" />
-                </node>
-                <node concept="liA8E" id="6aYyEt1Exhb" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+        <node concept="3clFbF" id="2LNowVOI08t" role="3cqZAp">
+          <node concept="2OqwBi" id="2LNowVOIbte" role="3clFbG">
+            <node concept="2OqwBi" id="2LNowVOI5X1" role="2Oq$k0">
+              <node concept="2YIFZM" id="2LNowVOI1$a" role="2Oq$k0">
+                <ref role="37wK5l" to="33ny:~Optional.ofNullable(java.lang.Object)" resolve="ofNullable" />
+                <ref role="1Pybhc" to="33ny:~Optional" resolve="Optional" />
+                <node concept="2EnYce" id="2LNowVOIqA6" role="37wK5m">
+                  <node concept="2OqwBi" id="2LNowVOIqA7" role="2Oq$k0">
+                    <node concept="2JrnkZ" id="2LNowVOIqA8" role="2Oq$k0">
+                      <node concept="13iPFW" id="2LNowVOIqA9" role="2JrQYb" />
+                    </node>
+                    <node concept="liA8E" id="2LNowVOIqAa" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="2LNowVOIqAb" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
+                  </node>
                 </node>
               </node>
-              <node concept="liA8E" id="6aYyEt1ExC7" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
+              <node concept="liA8E" id="2LNowVOI7fI" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Optional.stream()" resolve="stream" />
+              </node>
+            </node>
+            <node concept="liA8E" id="2LNowVOIdde" role="2OqNvi">
+              <ref role="37wK5l" to="1ctc:~Stream.collect(java.util.stream.Collector)" resolve="collect" />
+              <node concept="2YIFZM" id="2LNowVOIj1m" role="37wK5m">
+                <ref role="37wK5l" to="1ctc:~Collectors.toList()" resolve="toList" />
+                <ref role="1Pybhc" to="1ctc:~Collectors" resolve="Collectors" />
+                <node concept="3uibUv" id="2LNowVOInFY" role="3PaCim">
+                  <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                </node>
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.testbuffer.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.testbuffer.mps
new file mode 100644
index 00000000000..790f1931e98
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox/models/com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.testbuffer.mps
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:54ae00bf-b229-40d8-a444-f76ddb35f598(com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.testbuffer)">
+  <persistence version="9" />
+  <languages />
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
new file mode 100644
index 00000000000..ccf30534159
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
@@ -0,0 +1,799 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:3fdeb51a-09b6-4d23-b70d-99f85e768e16(test.com.mbeddr.mpsutil.logicalChild.test@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="286e2375-00e3-4042-b083-84873dd623be" name="com.mbeddr.mpsutil.logicalChild.sandbox" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
+    <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
+  </languages>
+  <imports>
+    <import index="n7tw" ref="r:e9fcc9c2-114c-4ba2-897c-9e44451eea40(com.mbeddr.mpsutil.logicalChild.behavior)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
+    <import index="xxir" ref="r:a615bfc0-ceb2-486e-85b1-8debbfdfdbb6(com.mbeddr.mpsutil.logicalChild.structure)" implicit="true" />
+    <import index="legp" ref="r:e06fc7a9-6c1d-4d1e-abb5-eda20a08c26c(com.mbeddr.mpsutil.logicalChild.sandbox.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
+        <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
+      </concept>
+      <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
+      <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
+        <property id="2616911529524314943" name="accessMode" index="3DII0k" />
+        <child id="1217501895093" name="testMethods" index="1SL9yI" />
+      </concept>
+      <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
+        <child id="1160998896846" name="condition" index="1gVkn0" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
+        <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
+      </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
+        <child id="8276990574886367509" name="finallyClause" index="1zxBo6" />
+        <child id="8276990574886367508" name="body" index="1zxBo7" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
+        <reference id="5455284157994012188" name="link" index="2pIpSl" />
+        <child id="1595412875168045827" name="initValue" index="28nt2d" />
+      </concept>
+      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
+        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
+      </concept>
+      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
+        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
+        <child id="5455284157993911099" name="values" index="2pJxcM" />
+      </concept>
+      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
+        <child id="8182547171709752112" name="expression" index="36biLW" />
+      </concept>
+    </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="361130699826193248" name="jetbrains.mps.lang.modelapi.structure.ModelPointer" flags="ng" index="1dCxOl">
+        <property id="1863527487546097494" name="modelId" index="1XweGQ" />
+        <child id="679099339649067980" name="name" index="1j$8Uc" />
+      </concept>
+      <concept id="679099339649053840" name="jetbrains.mps.lang.modelapi.structure.ModelName" flags="ng" index="1j_P7g">
+        <property id="679099339649053841" name="value" index="1j_P7h" />
+      </concept>
+    </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
+        <child id="8427750732757990725" name="actual" index="3tpDZA" />
+        <child id="8427750732757990724" name="expected" index="3tpDZB" />
+      </concept>
+      <concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
+      <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
+        <child id="1172073511101" name="message" index="3_1BAH" />
+      </concept>
+      <concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
+        <child id="1172075534298" name="message" index="3_9lra" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="4065387505485742666" name="jetbrains.mps.lang.smodel.structure.ModelPointer_ResolveOperation" flags="ng" index="2yCiCJ" />
+      <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
+        <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
+      </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
+      <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG" />
+      <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
+        <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
+      </concept>
+      <concept id="1206482823744" name="jetbrains.mps.lang.smodel.structure.Model_AddRootOperation" flags="nn" index="3BYIHo">
+        <child id="1206482823746" name="nodeArgument" index="3BYIHq" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+      <concept id="1863527487546129879" name="jetbrains.mps.lang.smodel.structure.ModelPointerExpression" flags="ng" index="1Xw6AR">
+        <child id="1863527487546132519" name="modelRef" index="1XwpL7" />
+      </concept>
+      <concept id="1863527487546132619" name="jetbrains.mps.lang.smodel.structure.SModelPointerType" flags="ig" index="1XwpNF" />
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
+      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+    </language>
+  </registry>
+  <node concept="1lH9Xt" id="2LNowVOGj07">
+    <property role="3DII0k" value="2hh8MJdVwqX/command" />
+    <property role="TrG5h" value="ILogicalChildResolving" />
+    <node concept="1LZb2c" id="2LNowVOJVaa" role="1SL9yI">
+      <property role="TrG5h" value="externalWithCache" />
+      <node concept="3cqZAl" id="2LNowVOJVab" role="3clF45" />
+      <node concept="3clFbS" id="2LNowVOJVac" role="3clF47">
+        <node concept="3cpWs8" id="2LNowVOJVad" role="3cqZAp">
+          <node concept="3cpWsn" id="2LNowVOJVae" role="3cpWs9">
+            <property role="TrG5h" value="bufferModel" />
+            <node concept="H_c77" id="2LNowVOJVaf" role="1tU5fm" />
+            <node concept="10Nm6u" id="2LNowVOJVag" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3J1_TO" id="2LNowVOJVah" role="3cqZAp">
+          <node concept="3clFbS" id="2LNowVOJVai" role="1zxBo7">
+            <node concept="3cpWs8" id="2LNowVOJVaj" role="3cqZAp">
+              <node concept="3cpWsn" id="2LNowVOJVak" role="3cpWs9">
+                <property role="TrG5h" value="exampleModel" />
+                <node concept="1XwpNF" id="2LNowVOJVal" role="1tU5fm" />
+                <node concept="1Xw6AR" id="2LNowVOJVam" role="33vP2m">
+                  <node concept="1dCxOl" id="2LNowVOJVan" role="1XwpL7">
+                    <property role="1XweGQ" value="r:ced7d7b2-46d1-452d-9f1f-a15fe0e7ebee" />
+                    <node concept="1j_P7g" id="2LNowVOJVao" role="1j$8Uc">
+                      <property role="1j_P7h" value="com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.example" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="2LNowVOJVap" role="3cqZAp">
+              <node concept="3cpWsn" id="2LNowVOJVaq" role="3cpWs9">
+                <property role="TrG5h" value="modell" />
+                <node concept="H_c77" id="2LNowVOJVar" role="1tU5fm" />
+                <node concept="2OqwBi" id="2LNowVOJVas" role="33vP2m">
+                  <node concept="37vLTw" id="2LNowVOJVat" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2LNowVOJVak" resolve="exampleModel" />
+                  </node>
+                  <node concept="2yCiCJ" id="2LNowVOJVau" role="2OqNvi">
+                    <node concept="2OqwBi" id="2LNowVOJVav" role="Vysub">
+                      <node concept="1jxXqW" id="2LNowVOJVaw" role="2Oq$k0" />
+                      <node concept="liA8E" id="2LNowVOJVax" role="2OqNvi">
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="2LNowVOJVay" role="3cqZAp">
+              <node concept="3cpWsn" id="2LNowVOJVaz" role="3cpWs9">
+                <property role="TrG5h" value="ilcos" />
+                <node concept="2I9FWS" id="2LNowVOJVa$" role="1tU5fm">
+                  <ref role="2I9WkF" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+                </node>
+                <node concept="2OqwBi" id="2LNowVOJVa_" role="33vP2m">
+                  <node concept="37vLTw" id="2LNowVOJVaA" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2LNowVOJVaq" resolve="modell" />
+                  </node>
+                  <node concept="2SmgA7" id="2LNowVOJVaB" role="2OqNvi">
+                    <node concept="chp4Y" id="2LNowVOJVaC" role="1dBWTz">
+                      <ref role="cht4Q" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="2LNowVOJVaD" role="3cqZAp" />
+            <node concept="1gVbGN" id="2LNowVOJVaE" role="3cqZAp">
+              <node concept="3clFbC" id="2LNowVOJVaF" role="1gVkn0">
+                <node concept="3cmrfG" id="2LNowVOJVaG" role="3uHU7w">
+                  <property role="3cmrfH" value="1" />
+                </node>
+                <node concept="2OqwBi" id="2LNowVOJVaH" role="3uHU7B">
+                  <node concept="37vLTw" id="2LNowVOJVaI" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2LNowVOJVaz" resolve="ilcos" />
+                  </node>
+                  <node concept="34oBXx" id="2LNowVOJVaJ" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="2LNowVOJVaK" role="3cqZAp">
+              <node concept="3cpWsn" id="2LNowVOJVaL" role="3cpWs9">
+                <property role="TrG5h" value="ilco" />
+                <node concept="3Tqbb2" id="2LNowVOJVaM" role="1tU5fm">
+                  <ref role="ehGHo" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+                </node>
+                <node concept="2OqwBi" id="2LNowVOJVaN" role="33vP2m">
+                  <node concept="37vLTw" id="2LNowVOJVaO" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2LNowVOJVaz" resolve="ilcos" />
+                  </node>
+                  <node concept="34jXtK" id="2LNowVOJVaP" role="2OqNvi">
+                    <node concept="3cmrfG" id="2LNowVOJVaQ" role="25WWJ7">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="2LNowVOKuJU" role="3cqZAp" />
+            <node concept="3SKdUt" id="3kJ7$$sNLkj" role="3cqZAp">
+              <node concept="1PaTwC" id="3kJ7$$sNLkk" role="1aUNEU">
+                <node concept="3oM_SD" id="2LNowVOKwoG" role="1PaTwD">
+                  <property role="3oM_SC" value="turn" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKwoI" role="1PaTwD">
+                  <property role="3oM_SC" value="on" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKwoL" role="1PaTwD">
+                  <property role="3oM_SC" value="caching" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKwoP" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2LNowVOJWb_" role="3cqZAp">
+              <node concept="2YIFZM" id="2LNowVOJWy0" role="3clFbG">
+                <ref role="37wK5l" to="n7tw:6aYyEt27Bpy" resolve="useCacheNow" />
+                <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+              </node>
+            </node>
+            <node concept="3cpWs8" id="2LNowVOJVaT" role="3cqZAp">
+              <node concept="3cpWsn" id="2LNowVOJVaU" role="3cpWs9">
+                <property role="TrG5h" value="logicalChildren" />
+                <node concept="_YKpA" id="2LNowVOJVaV" role="1tU5fm">
+                  <node concept="3Tqbb2" id="2LNowVOJVaW" role="_ZDj9">
+                    <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="2LNowVOJVaX" role="33vP2m">
+                  <node concept="2OqwBi" id="2LNowVOJVaY" role="2Oq$k0">
+                    <node concept="37vLTw" id="2LNowVOJVaZ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                    </node>
+                    <node concept="2qgKlT" id="2LNowVOJVb0" role="2OqNvi">
+                      <ref role="37wK5l" to="n7tw:7c93VeVMIYV" resolve="findLogicalChildren" />
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="2LNowVOJVb1" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="2LNowVOKxjb" role="3cqZAp">
+              <node concept="1PaTwC" id="2LNowVOKxjc" role="1aUNEU">
+                <node concept="3oM_SD" id="2LNowVOKxzx" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKxzz" role="1PaTwD">
+                  <property role="3oM_SC" value="existing" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKxzA" role="1PaTwD">
+                  <property role="3oM_SC" value="two" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKxzE" role="1PaTwD">
+                  <property role="3oM_SC" value="children" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKxzJ" role="1PaTwD">
+                  <property role="3oM_SC" value="must" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKxzP" role="1PaTwD">
+                  <property role="3oM_SC" value="be" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKxzW" role="1PaTwD">
+                  <property role="3oM_SC" value="found." />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKx$4" role="1PaTwD">
+                  <property role="3oM_SC" value="Side" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKx$d" role="1PaTwD">
+                  <property role="3oM_SC" value="effect:" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKx$n" role="1PaTwD">
+                  <property role="3oM_SC" value="cache" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKx$V" role="1PaTwD">
+                  <property role="3oM_SC" value="was" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKx_7" role="1PaTwD">
+                  <property role="3oM_SC" value="built" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKx_k" role="1PaTwD">
+                  <property role="3oM_SC" value="in" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKx_y" role="1PaTwD">
+                  <property role="3oM_SC" value="background" />
+                </node>
+              </node>
+            </node>
+            <node concept="3vlDli" id="2LNowVOJVb2" role="3cqZAp">
+              <node concept="3cmrfG" id="2LNowVOJVb3" role="3tpDZB">
+                <property role="3cmrfH" value="2" />
+              </node>
+              <node concept="2OqwBi" id="2LNowVOJVb4" role="3tpDZA">
+                <node concept="37vLTw" id="2LNowVOJVb5" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2LNowVOJVaU" resolve="logicalChildren" />
+                </node>
+                <node concept="34oBXx" id="2LNowVOJVb6" role="2OqNvi" />
+              </node>
+              <node concept="3_1$Yv" id="2LNowVOJVb7" role="3_9lra">
+                <node concept="3cpWs3" id="2LNowVOJVb8" role="3_1BAH">
+                  <node concept="2OqwBi" id="2LNowVOJVb9" role="3uHU7w">
+                    <node concept="37vLTw" id="2LNowVOJVba" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2LNowVOJVaU" resolve="logicalChildren" />
+                    </node>
+                    <node concept="34oBXx" id="2LNowVOJVbb" role="2OqNvi" />
+                  </node>
+                  <node concept="Xl_RD" id="2LNowVOJVbc" role="3uHU7B">
+                    <property role="Xl_RC" value="children was " />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="2LNowVOJVbd" role="3cqZAp" />
+            <node concept="3SKdUt" id="2LNowVOKy8d" role="3cqZAp">
+              <node concept="1PaTwC" id="2LNowVOKy8e" role="1aUNEU">
+                <node concept="3oM_SD" id="2LNowVOKyWG" role="1PaTwD">
+                  <property role="3oM_SC" value="Add" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyWI" role="1PaTwD">
+                  <property role="3oM_SC" value="a" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyWL" role="1PaTwD">
+                  <property role="3oM_SC" value="new" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyWP" role="1PaTwD">
+                  <property role="3oM_SC" value="child" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyWU" role="1PaTwD">
+                  <property role="3oM_SC" value="to" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyX0" role="1PaTwD">
+                  <property role="3oM_SC" value="a" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyX7" role="1PaTwD">
+                  <property role="3oM_SC" value="model" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyXf" role="1PaTwD">
+                  <property role="3oM_SC" value="in" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyXo" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyXy" role="1PaTwD">
+                  <property role="3oM_SC" value="same" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKyXH" role="1PaTwD">
+                  <property role="3oM_SC" value="solution" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="2LNowVOJVbe" role="3cqZAp">
+              <node concept="3cpWsn" id="2LNowVOJVbf" role="3cpWs9">
+                <property role="TrG5h" value="bufferPTR" />
+                <node concept="1XwpNF" id="2LNowVOJVbg" role="1tU5fm" />
+                <node concept="1Xw6AR" id="2LNowVOJVbh" role="33vP2m">
+                  <node concept="1dCxOl" id="2LNowVOJVbi" role="1XwpL7">
+                    <property role="1XweGQ" value="r:54ae00bf-b229-40d8-a444-f76ddb35f598" />
+                    <node concept="1j_P7g" id="2LNowVOJVbj" role="1j$8Uc">
+                      <property role="1j_P7h" value="com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.testbuffer" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2LNowVOJVbk" role="3cqZAp">
+              <node concept="37vLTI" id="2LNowVOJVbl" role="3clFbG">
+                <node concept="2OqwBi" id="2LNowVOJVbm" role="37vLTx">
+                  <node concept="37vLTw" id="2LNowVOJVbn" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2LNowVOJVbf" resolve="bufferPTR" />
+                  </node>
+                  <node concept="2yCiCJ" id="2LNowVOJVbo" role="2OqNvi">
+                    <node concept="2OqwBi" id="2LNowVOJVbp" role="Vysub">
+                      <node concept="1jxXqW" id="2LNowVOJVbq" role="2Oq$k0" />
+                      <node concept="liA8E" id="2LNowVOJVbr" role="2OqNvi">
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="2LNowVOJVbs" role="37vLTJ">
+                  <ref role="3cqZAo" node="2LNowVOJVae" resolve="bufferModel" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="2LNowVOJVbu" role="3cqZAp">
+              <node concept="3cpWsn" id="2LNowVOJVbv" role="3cpWs9">
+                <property role="TrG5h" value="newChild" />
+                <node concept="3Tqbb2" id="2LNowVOJVbw" role="1tU5fm">
+                  <ref role="ehGHo" to="legp:jksL7exZEY" resolve="RootNodeWithReferenceToLogicalOwner" />
+                </node>
+                <node concept="2pJPEk" id="2LNowVOJVbx" role="33vP2m">
+                  <node concept="2pJPED" id="2LNowVOJVby" role="2pJPEn">
+                    <ref role="2pJxaS" to="legp:jksL7exZEY" resolve="RootNodeWithReferenceToLogicalOwner" />
+                    <node concept="2pIpSj" id="2LNowVOJVbz" role="2pJxcM">
+                      <ref role="2pIpSl" to="legp:5SdnHczgLRK" resolve="owner" />
+                      <node concept="36biLy" id="2LNowVOJVb$" role="28nt2d">
+                        <node concept="1PxgMI" id="2LNowVOJVb_" role="36biLW">
+                          <node concept="chp4Y" id="2LNowVOJVbA" role="3oSUPX">
+                            <ref role="cht4Q" to="legp:jksL7exYJ9" resolve="NodeWithLogicalChildren" />
+                          </node>
+                          <node concept="37vLTw" id="2LNowVOJVbB" role="1m5AlR">
+                            <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2LNowVOJVbC" role="3cqZAp">
+              <node concept="2OqwBi" id="2LNowVOJVbD" role="3clFbG">
+                <node concept="37vLTw" id="2LNowVOJVbE" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2LNowVOJVae" resolve="bufferModel" />
+                </node>
+                <node concept="3BYIHo" id="2LNowVOJVbF" role="2OqNvi">
+                  <node concept="37vLTw" id="2LNowVOJVbG" role="3BYIHq">
+                    <ref role="3cqZAo" node="2LNowVOJVbv" resolve="newChild" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="2LNowVOJVbH" role="3cqZAp" />
+            <node concept="3clFbH" id="2LNowVOJVbI" role="3cqZAp" />
+            <node concept="3cpWs8" id="2LNowVOJVbJ" role="3cqZAp">
+              <node concept="3cpWsn" id="2LNowVOJVbK" role="3cpWs9">
+                <property role="TrG5h" value="logicalChildren2" />
+                <node concept="_YKpA" id="2LNowVOJVbL" role="1tU5fm">
+                  <node concept="3Tqbb2" id="2LNowVOJVbM" role="_ZDj9">
+                    <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="2LNowVOJVbN" role="33vP2m">
+                  <node concept="2OqwBi" id="2LNowVOJVbO" role="2Oq$k0">
+                    <node concept="37vLTw" id="2LNowVOJVbP" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                    </node>
+                    <node concept="2qgKlT" id="2LNowVOJVbQ" role="2OqNvi">
+                      <ref role="37wK5l" to="n7tw:7c93VeVMIYV" resolve="findLogicalChildren" />
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="2LNowVOJVbR" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="2LNowVOKzkG" role="3cqZAp">
+              <node concept="1PaTwC" id="2LNowVOKzkH" role="1aUNEU">
+                <node concept="3oM_SD" id="2LNowVOKz_u" role="1PaTwD">
+                  <property role="3oM_SC" value="The" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKz_w" role="1PaTwD">
+                  <property role="3oM_SC" value="new" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKz_z" role="1PaTwD">
+                  <property role="3oM_SC" value="child" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKz_B" role="1PaTwD">
+                  <property role="3oM_SC" value="is" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKz_G" role="1PaTwD">
+                  <property role="3oM_SC" value="not" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKz_M" role="1PaTwD">
+                  <property role="3oM_SC" value="found" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKz_T" role="1PaTwD">
+                  <property role="3oM_SC" value="as" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKzA1" role="1PaTwD">
+                  <property role="3oM_SC" value="still" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKzAa" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKzAk" role="1PaTwD">
+                  <property role="3oM_SC" value="Cache" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKzAv" role="1PaTwD">
+                  <property role="3oM_SC" value="is" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOKzAF" role="1PaTwD">
+                  <property role="3oM_SC" value="used" />
+                </node>
+              </node>
+            </node>
+            <node concept="3vlDli" id="2LNowVOJVbS" role="3cqZAp">
+              <node concept="3cmrfG" id="2LNowVOJVbT" role="3tpDZB">
+                <property role="3cmrfH" value="2" />
+              </node>
+              <node concept="2OqwBi" id="2LNowVOJVbU" role="3tpDZA">
+                <node concept="37vLTw" id="2LNowVOJVbV" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2LNowVOJVbK" resolve="logicalChildren2" />
+                </node>
+                <node concept="34oBXx" id="2LNowVOJVbW" role="2OqNvi" />
+              </node>
+              <node concept="3_1$Yv" id="2LNowVOJVbX" role="3_9lra">
+                <node concept="3cpWs3" id="2LNowVOJVbY" role="3_1BAH">
+                  <node concept="2OqwBi" id="2LNowVOJVbZ" role="3uHU7w">
+                    <node concept="37vLTw" id="2LNowVOJVc0" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2LNowVOJVbK" resolve="logicalChildren2" />
+                    </node>
+                    <node concept="34oBXx" id="2LNowVOJVc1" role="2OqNvi" />
+                  </node>
+                  <node concept="Xl_RD" id="2LNowVOJVc2" role="3uHU7B">
+                    <property role="Xl_RC" value="children was " />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="2LNowVOKzRQ" role="3cqZAp">
+              <node concept="1PaTwC" id="2LNowVOKzRR" role="1aUNEU">
+                <node concept="3oM_SD" id="2LNowVOK$8Q" role="1PaTwD">
+                  <property role="3oM_SC" value="Remove" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$8S" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$8V" role="1PaTwD">
+                  <property role="3oM_SC" value="cache" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2LNowVOJX3x" role="3cqZAp">
+              <node concept="2YIFZM" id="2LNowVOJXrA" role="3clFbG">
+                <ref role="37wK5l" to="n7tw:6aYyEt27DQJ" resolve="stopUsingCache" />
+                <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+              </node>
+            </node>
+            <node concept="3clFbH" id="2LNowVOJWRl" role="3cqZAp" />
+            <node concept="3cpWs8" id="2LNowVOK1k8" role="3cqZAp">
+              <node concept="3cpWsn" id="2LNowVOK1k9" role="3cpWs9">
+                <property role="TrG5h" value="logicalChildren3" />
+                <node concept="_YKpA" id="2LNowVOK1ka" role="1tU5fm">
+                  <node concept="3Tqbb2" id="2LNowVOK1kb" role="_ZDj9">
+                    <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="2LNowVOK1kc" role="33vP2m">
+                  <node concept="2OqwBi" id="2LNowVOK1kd" role="2Oq$k0">
+                    <node concept="37vLTw" id="2LNowVOK1ke" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                    </node>
+                    <node concept="2qgKlT" id="2LNowVOK1kf" role="2OqNvi">
+                      <ref role="37wK5l" to="n7tw:7c93VeVMIYV" resolve="findLogicalChildren" />
+                    </node>
+                  </node>
+                  <node concept="ANE8D" id="2LNowVOK1kg" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3SKdUt" id="2LNowVOK$q2" role="3cqZAp">
+              <node concept="1PaTwC" id="2LNowVOK$q3" role="1aUNEU">
+                <node concept="3oM_SD" id="2LNowVOK$F7" role="1PaTwD">
+                  <property role="3oM_SC" value="Now" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$F9" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$Fc" role="1PaTwD">
+                  <property role="3oM_SC" value="3rd" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$Fg" role="1PaTwD">
+                  <property role="3oM_SC" value="child" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$Fl" role="1PaTwD">
+                  <property role="3oM_SC" value="is" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$Fr" role="1PaTwD">
+                  <property role="3oM_SC" value="found" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$FN" role="1PaTwD">
+                  <property role="3oM_SC" value="resolving" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$FV" role="1PaTwD">
+                  <property role="3oM_SC" value="does" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$G4" role="1PaTwD">
+                  <property role="3oM_SC" value="not" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$Ge" role="1PaTwD">
+                  <property role="3oM_SC" value="use" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$Gp" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="2LNowVOK$G_" role="1PaTwD">
+                  <property role="3oM_SC" value="cache." />
+                </node>
+              </node>
+            </node>
+            <node concept="3vlDli" id="2LNowVOK1kh" role="3cqZAp">
+              <node concept="3cmrfG" id="2LNowVOK1ki" role="3tpDZB">
+                <property role="3cmrfH" value="3" />
+              </node>
+              <node concept="2OqwBi" id="2LNowVOK1kj" role="3tpDZA">
+                <node concept="37vLTw" id="2LNowVOK1kk" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2LNowVOK1k9" resolve="logicalChildren2" />
+                </node>
+                <node concept="34oBXx" id="2LNowVOK1kl" role="2OqNvi" />
+              </node>
+              <node concept="3_1$Yv" id="2LNowVOK1km" role="3_9lra">
+                <node concept="3cpWs3" id="2LNowVOK1kn" role="3_1BAH">
+                  <node concept="2OqwBi" id="2LNowVOK1ko" role="3uHU7w">
+                    <node concept="37vLTw" id="2LNowVOK1kp" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2LNowVOK1k9" resolve="logicalChildren2" />
+                    </node>
+                    <node concept="34oBXx" id="2LNowVOK1kq" role="2OqNvi" />
+                  </node>
+                  <node concept="Xl_RD" id="2LNowVOK1kr" role="3uHU7B">
+                    <property role="Xl_RC" value="children was " />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="2LNowVOK17m" role="3cqZAp" />
+          </node>
+          <node concept="1wplmZ" id="2LNowVOJVc3" role="1zxBo6">
+            <node concept="3clFbS" id="2LNowVOJVc4" role="1wplMD">
+              <node concept="3clFbJ" id="2LNowVOJVc5" role="3cqZAp">
+                <node concept="3clFbS" id="2LNowVOJVc6" role="3clFbx">
+                  <node concept="3SKdUt" id="2LNowVOK_zZ" role="3cqZAp">
+                    <node concept="1PaTwC" id="2LNowVOK_$0" role="1aUNEU">
+                      <node concept="3oM_SD" id="2LNowVOK_Lw" role="1PaTwD">
+                        <property role="3oM_SC" value="" />
+                      </node>
+                      <node concept="3oM_SD" id="2LNowVOK_L_" role="1PaTwD">
+                        <property role="3oM_SC" value="Remove" />
+                      </node>
+                      <node concept="3oM_SD" id="2LNowVOK_Ly" role="1PaTwD">
+                        <property role="3oM_SC" value="the" />
+                      </node>
+                      <node concept="3oM_SD" id="2LNowVOK_LD" role="1PaTwD">
+                        <property role="3oM_SC" value="added" />
+                      </node>
+                      <node concept="3oM_SD" id="2LNowVOK_LI" role="1PaTwD">
+                        <property role="3oM_SC" value="child" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="2LNowVOJVc7" role="3cqZAp">
+                    <node concept="2OqwBi" id="2LNowVOJVc8" role="3clFbG">
+                      <node concept="2OqwBi" id="2LNowVOJVc9" role="2Oq$k0">
+                        <node concept="37vLTw" id="2LNowVOJVca" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2LNowVOJVae" resolve="bufferModel" />
+                        </node>
+                        <node concept="2RRcyG" id="2LNowVOJVcb" role="2OqNvi" />
+                      </node>
+                      <node concept="2es0OD" id="2LNowVOJVcc" role="2OqNvi">
+                        <node concept="1bVj0M" id="2LNowVOJVcd" role="23t8la">
+                          <node concept="3clFbS" id="2LNowVOJVce" role="1bW5cS">
+                            <node concept="3clFbF" id="2LNowVOJVcf" role="3cqZAp">
+                              <node concept="2OqwBi" id="2LNowVOJVcg" role="3clFbG">
+                                <node concept="37vLTw" id="2LNowVOJVch" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2LNowVOJVcj" resolve="it" />
+                                </node>
+                                <node concept="3YRAZt" id="2LNowVOJVci" role="2OqNvi" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="Rh6nW" id="2LNowVOJVcj" role="1bW2Oz">
+                            <property role="TrG5h" value="it" />
+                            <node concept="2jxLKc" id="2LNowVOJVck" role="1tU5fm" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="2LNowVOJVcl" role="3clFbw">
+                  <node concept="10Nm6u" id="2LNowVOJVcm" role="3uHU7w" />
+                  <node concept="37vLTw" id="2LNowVOJVcn" role="3uHU7B">
+                    <ref role="3cqZAo" node="2LNowVOJVae" resolve="bufferModel" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2XOHcx" id="4Ijegxhuddk">
+    <property role="2XOHcw" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.mpsutil" />
+  </node>
+</model>
+
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd
new file mode 100644
index 00000000000..87a2a871040
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="test.com.mbeddr.mpsutil.logicalChild" uuid="943c7443-45f4-48a4-a282-49cc46ddc1bf" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot type="default" contentPath="${module}">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet compile="mps" classes="mps" ext="no" type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">286e2375-00e3-4042-b083-84873dd623be(com.mbeddr.mpsutil.logicalChild.sandbox)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:85a9bace-37a1-40af-956a-7bb1b081a77c:com.mbeddr.mpsutil.logicalChild" version="0" />
+    <language slang="l:286e2375-00e3-4042-b083-84873dd623be:com.mbeddr.mpsutil.logicalChild.sandbox" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="85a9bace-37a1-40af-956a-7bb1b081a77c(com.mbeddr.mpsutil.logicalChild)" version="0" />
+    <module reference="286e2375-00e3-4042-b083-84873dd623be(com.mbeddr.mpsutil.logicalChild.sandbox)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="943c7443-45f4-48a4-a282-49cc46ddc1bf(test.com.mbeddr.mpsutil.logicalChild)" version="0" />
+  </dependencyVersions>
+</solution>
+

From 3968ef0f63a1bf3a06122b18aa455efdbdd54585 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 10 Oct 2024 13:54:41 +0200
Subject: [PATCH 07/15] Adds test solution to build solution (#2547)

---
 .../com.mbeddr.platform.tests.build.mps       | 144 +++++++++++++++---
 1 file changed, 124 insertions(+), 20 deletions(-)

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
index ba239e1dac4..4e853efca01 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
@@ -427,6 +427,130 @@
     </node>
     <node concept="2G$12M" id="7eF9rfAnzVd" role="3989C9">
       <property role="TrG5h" value="com.mbeddr.platform.tests" />
+      <node concept="1E1JtA" id="2LNowVOKCVI" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="test.com.mbeddr.mpsutil.logicalChild" />
+        <property role="3LESm3" value="943c7443-45f4-48a4-a282-49cc46ddc1bf" />
+        <node concept="398BVA" id="2LNowVOKD8$" role="3LF7KH">
+          <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+          <node concept="2Ry0Ak" id="2LNowVOKDji" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="2LNowVOKDjZ" role="2Ry0An">
+              <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
+              <node concept="2Ry0Ak" id="2LNowVOKDm2" role="2Ry0An">
+                <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2LNowVOKDmI" role="3bR37C">
+          <node concept="3bR9La" id="2LNowVOKDmJ" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="2LNowVOKDn2" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="2LNowVOKDn3" role="1HemKq">
+            <node concept="398BVA" id="2LNowVOKDmK" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="2LNowVOKDmL" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="2LNowVOKDmM" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
+                  <node concept="2Ry0Ak" id="2LNowVOKDmN" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="2LNowVOKDn4" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2LNowVOKECZ" role="3bR37C">
+          <node concept="3bR9La" id="2LNowVOKED0" role="1SiIV1">
+            <ref role="3bR37D" node="2LNowVOKDWi" resolve="com.mbeddr.mpsutil.logicalChild.sandbox" />
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="2LNowVOKDWi" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
+        <property role="3LESm3" value="286e2375-00e3-4042-b083-84873dd623be" />
+        <node concept="398BVA" id="2LNowVOKEls" role="3LF7KH">
+          <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+          <node concept="2Ry0Ak" id="2LNowVOKEny" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="2LNowVOKEpB" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
+              <node concept="2Ry0Ak" id="2LNowVOKEr2" role="2Ry0An">
+                <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2LNowVOKEs1" role="3bR37C">
+          <node concept="3bR9La" id="2LNowVOKEs2" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2LNowVOKEs3" role="3bR37C">
+          <node concept="3bR9La" id="2LNowVOKEs4" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2LNowVOKEs5" role="3bR37C">
+          <node concept="3bR9La" id="2LNowVOKEs6" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="2LNowVOKEsp" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="2LNowVOKEsq" role="1HemKq">
+            <node concept="398BVA" id="2LNowVOKEs7" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="2LNowVOKEs8" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="2LNowVOKEs9" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
+                  <node concept="2Ry0Ak" id="2LNowVOKEsa" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="2LNowVOKEsr" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2LNowVOKEss" role="3bR37C">
+          <node concept="1Busua" id="2LNowVOKEst" role="1SiIV1">
+            <ref role="1Busuk" to="al5i:3lcj7hzsmpl" resolve="com.mbeddr.mpsutil.logicalChild" />
+          </node>
+        </node>
+        <node concept="3rtmxn" id="2LNowVOKEPq" role="3bR31x">
+          <node concept="3LXTmp" id="2LNowVOKEPr" role="3rtmxm">
+            <node concept="398BVA" id="2LNowVOKEPs" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="2LNowVOKEPt" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="2LNowVOKEPu" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="2LNowVOKEPw" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="1E1JtA" id="75qFqB43e5u" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="tests.com.mbeddr.mpsutil.json" />
@@ -1517,31 +1641,11 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="bHMJKhDDf7" role="3bR37C">
-          <node concept="3bR9La" id="bHMJKhDDf8" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:776vT$mQZbf" resolve="com.mbeddr.mpsutil.comparator" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="bHMJKhDDf9" role="3bR37C">
           <node concept="3bR9La" id="bHMJKhDDfa" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="bHMJKhDDfb" role="3bR37C">
-          <node concept="3bR9La" id="bHMJKhDDfc" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="bHMJKhDDfd" role="3bR37C">
-          <node concept="3bR9La" id="bHMJKhDDfe" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:vOGyTeKPEA" resolve="com.mbeddr.mpsutil.ecore.testing" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="bHMJKhDDff" role="3bR37C">
-          <node concept="3bR9La" id="bHMJKhDDfg" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
-          </node>
-        </node>
         <node concept="398BVA" id="bHMJKhDAXY" role="3LF7KH">
           <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
           <node concept="2Ry0Ak" id="bHMJKhDAYF" role="iGT6I">

From 3c27d6dad6d955fa868032ef5ef27494b2c83f59 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 10 Oct 2024 14:07:37 +0200
Subject: [PATCH 08/15] Add entry to CHANGELOG.md (#2547)

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d5e16b2964..1332cd27151 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 # October 2024
 
+## com.mbeddr.mpsutil
+
+### Feature
+
+- Adds a caching mechanism for caching the retrieval of 'ILogicalChild' by 'ILogicalChildOwner'
+
 ## com.mbeddr.mpsutil.ecore
 
 ### Fixed

From 12906457825d1f6b1bdc4ba5aed4d19c92511866 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Thu, 10 Oct 2024 16:02:26 +0200
Subject: [PATCH 09/15] Refactor Code Structure (#2547)

---
 ...m.mbeddr.mpsutil.logicalChild.behavior.mps | 106 +++-
 ...mbeddr.mpsutil.logicalChild.test@tests.mps | 588 +++++++++---------
 2 files changed, 399 insertions(+), 295 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index 233b8cc0abb..710bebb7a01 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -16,6 +16,8 @@
     <import index="3o3z" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.google.common.collect(MPS.IDEA/)" />
     <import index="17wx" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.locks(JDK/)" />
     <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
+    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
+    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -72,6 +74,13 @@
       <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
+      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
+      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
+        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
+      </concept>
+      <concept id="1109283449304" name="jetbrains.mps.baseLanguage.structure.TypeVariableReference" flags="in" index="16syzq">
+        <reference id="1109283546497" name="typeVariableDeclaration" index="16sUi3" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -82,6 +91,7 @@
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1164879685961" name="throwsItem" index="Sfmx6" />
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -136,10 +146,17 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
+        <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
+      </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
+        <child id="8276990574886367509" name="finallyClause" index="1zxBo6" />
+        <child id="8276990574886367508" name="body" index="1zxBo7" />
+      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
@@ -157,11 +174,16 @@
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5858074156537397872" name="jetbrains.mps.baseLanguage.javadoc.structure.ThrowsBlockDocTag" flags="ng" index="x0GOo">
+        <property id="5858074156537397874" name="text" index="x0GOq" />
+        <child id="6832197706140448505" name="exceptionType" index="zrq5$" />
+      </concept>
       <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
         <property id="5858074156537516431" name="text" index="x79VB" />
       </concept>
       <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
       <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
+      <concept id="6832197706140518107" name="jetbrains.mps.baseLanguage.javadoc.structure.DocTypeParameterReference" flags="ng" index="zr_56" />
       <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
         <reference id="6832197706140518108" name="param" index="zr_51" />
       </concept>
@@ -782,6 +804,86 @@
     </node>
     <node concept="2tJIrI" id="7LqGxA8AZ1u" role="jymVt" />
     <node concept="2tJIrI" id="7LqGxA8CBz9" role="jymVt" />
+    <node concept="2YIFZL" id="4dKV7gVaIME" role="jymVt">
+      <property role="TrG5h" value="withCachedLogicalChildren" />
+      <node concept="3clFbS" id="4dKV7gVaIMK" role="3clF47">
+        <node concept="3J1_TO" id="4dKV7gVaOg$" role="3cqZAp">
+          <node concept="3clFbS" id="4dKV7gVaOg_" role="1zxBo7">
+            <node concept="3clFbF" id="4dKV7gVaMbB" role="3cqZAp">
+              <node concept="1rXfSq" id="4dKV7gVaMbA" role="3clFbG">
+                <ref role="37wK5l" node="6aYyEt27Bpy" resolve="useCacheNow" />
+              </node>
+            </node>
+            <node concept="3cpWs6" id="4dKV7gVclRJ" role="3cqZAp">
+              <node concept="2OqwBi" id="4dKV7gVcowk" role="3cqZAk">
+                <node concept="37vLTw" id="4dKV7gVcowl" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4dKV7gVaIMG" resolve="runnable" />
+                </node>
+                <node concept="liA8E" id="4dKV7gVcowm" role="2OqNvi">
+                  <ref role="37wK5l" to="5zyv:~Callable.call()" resolve="call" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1wplmZ" id="4dKV7gVaOgA" role="1zxBo6">
+            <node concept="3clFbS" id="4dKV7gVaOgB" role="1wplMD">
+              <node concept="3clFbF" id="4dKV7gVaOwz" role="3cqZAp">
+                <node concept="1rXfSq" id="4dKV7gVaOwy" role="3clFbG">
+                  <ref role="37wK5l" node="6aYyEt27DQJ" resolve="stopUsingCache" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16syzq" id="4dKV7gVco2l" role="3clF45">
+        <ref role="16sUi3" node="4dKV7gVcil2" resolve="T" />
+      </node>
+      <node concept="37vLTG" id="4dKV7gVaIMG" role="3clF46">
+        <property role="TrG5h" value="codeToBeRun" />
+        <node concept="3uibUv" id="4dKV7gVaIMH" role="1tU5fm">
+          <ref role="3uigEE" to="5zyv:~Callable" resolve="Callable" />
+          <node concept="16syzq" id="4dKV7gVck2X" role="11_B2D">
+            <ref role="16sUi3" node="4dKV7gVcil2" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4dKV7gVaIMJ" role="1B3o_S" />
+      <node concept="16euLQ" id="4dKV7gVcil2" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="3uibUv" id="4dKV7gVcmoN" role="Sfmx6">
+        <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+      </node>
+      <node concept="P$JXv" id="4dKV7gVjhVd" role="lGtFl">
+        <node concept="TZ5HA" id="4dKV7gVjhVe" role="TZ5H$">
+          <node concept="1dT_AC" id="4dKV7gVjhVf" role="1dT_Ay">
+            <property role="1dT_AB" value="Wrap a code block with an environment where any call to the method 'findLogicalChildren' of 'ILogicalChildOwner' is cached." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="4dKV7gVjhVg" role="3nqlJM">
+          <property role="TUZQ4" value="code block" />
+          <node concept="zr_55" id="4dKV7gVjhVi" role="zr_5Q">
+            <ref role="zr_51" node="4dKV7gVaIMG" resolve="codeToBeRun" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="4dKV7gVjhVj" role="3nqlJM">
+          <property role="TUZQ4" value="type of result " />
+          <node concept="zr_56" id="4dKV7gVjhVl" role="zr_5Q">
+            <ref role="zr_51" node="4dKV7gVcil2" resolve="T" />
+          </node>
+        </node>
+        <node concept="x0GOo" id="4dKV7gVjhVm" role="3nqlJM">
+          <property role="x0GOq" value=" " />
+          <node concept="3uibUv" id="4dKV7gVjhVo" role="zrq5$">
+            <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+          </node>
+        </node>
+        <node concept="x79VA" id="4dKV7gVjhVp" role="3nqlJM">
+          <property role="x79VB" value="result" />
+        </node>
+      </node>
+    </node>
     <node concept="2YIFZL" id="6aYyEt27Bpy" role="jymVt">
       <property role="TrG5h" value="useCacheNow" />
       <node concept="3clFbS" id="6aYyEt27BpA" role="3clF47">
@@ -807,7 +909,7 @@
         </node>
       </node>
       <node concept="3cqZAl" id="6aYyEt27Bp$" role="3clF45" />
-      <node concept="3Tm1VV" id="6aYyEt27Bp_" role="1B3o_S" />
+      <node concept="3Tm6S6" id="4dKV7gVjdD_" role="1B3o_S" />
       <node concept="P$JXv" id="6aYyEt27ViZ" role="lGtFl">
         <node concept="TZ5HA" id="6aYyEt27Vj0" role="TZ5H$">
           <node concept="1dT_AC" id="6aYyEt27Vj1" role="1dT_Ay">
@@ -860,7 +962,7 @@
         </node>
       </node>
       <node concept="3cqZAl" id="6aYyEt27DQL" role="3clF45" />
-      <node concept="3Tm1VV" id="6aYyEt27DQM" role="1B3o_S" />
+      <node concept="3Tm6S6" id="4dKV7gVjdOV" role="1B3o_S" />
       <node concept="P$JXv" id="6aYyEt27WCY" role="lGtFl">
         <node concept="TZ5HA" id="6aYyEt27WCZ" role="TZ5H$">
           <node concept="1dT_AC" id="6aYyEt27WD0" role="1dT_Ay">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
index ccf30534159..4bd6fa3cc45 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
@@ -14,6 +14,7 @@
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
     <import index="xxir" ref="r:a615bfc0-ceb2-486e-85b1-8debbfdfdbb6(com.mbeddr.mpsutil.logicalChild.structure)" implicit="true" />
     <import index="legp" ref="r:e06fc7a9-6c1d-4d1e-abb5-eda20a08c26c(com.mbeddr.mpsutil.logicalChild.sandbox.structure)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -56,6 +57,7 @@
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1164879685961" name="throwsItem" index="Sfmx6" />
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
@@ -85,6 +87,11 @@
       </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+        <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
@@ -326,319 +333,311 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="2LNowVOJWb_" role="3cqZAp">
-              <node concept="2YIFZM" id="2LNowVOJWy0" role="3clFbG">
-                <ref role="37wK5l" to="n7tw:6aYyEt27Bpy" resolve="useCacheNow" />
+            <node concept="3clFbF" id="4dKV7gVb3By" role="3cqZAp">
+              <node concept="2YIFZM" id="4dKV7gVb3YN" role="3clFbG">
+                <ref role="37wK5l" to="n7tw:4dKV7gVaIME" resolve="withCachedLogicalChildren" />
                 <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
-              </node>
-            </node>
-            <node concept="3cpWs8" id="2LNowVOJVaT" role="3cqZAp">
-              <node concept="3cpWsn" id="2LNowVOJVaU" role="3cpWs9">
-                <property role="TrG5h" value="logicalChildren" />
-                <node concept="_YKpA" id="2LNowVOJVaV" role="1tU5fm">
-                  <node concept="3Tqbb2" id="2LNowVOJVaW" role="_ZDj9">
-                    <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="2LNowVOJVaX" role="33vP2m">
-                  <node concept="2OqwBi" id="2LNowVOJVaY" role="2Oq$k0">
-                    <node concept="37vLTw" id="2LNowVOJVaZ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                <node concept="1bVj0M" id="4dKV7gVb4hn" role="37wK5m">
+                  <node concept="3clFbS" id="4dKV7gVb4ho" role="1bW5cS">
+                    <node concept="3clFbH" id="4dKV7gVb4$Q" role="3cqZAp" />
+                    <node concept="3cpWs8" id="2LNowVOJVaT" role="3cqZAp">
+                      <node concept="3cpWsn" id="2LNowVOJVaU" role="3cpWs9">
+                        <property role="TrG5h" value="logicalChildren" />
+                        <node concept="_YKpA" id="2LNowVOJVaV" role="1tU5fm">
+                          <node concept="3Tqbb2" id="2LNowVOJVaW" role="_ZDj9">
+                            <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="2LNowVOJVaX" role="33vP2m">
+                          <node concept="2OqwBi" id="2LNowVOJVaY" role="2Oq$k0">
+                            <node concept="37vLTw" id="2LNowVOJVaZ" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                            </node>
+                            <node concept="2qgKlT" id="2LNowVOJVb0" role="2OqNvi">
+                              <ref role="37wK5l" to="n7tw:7c93VeVMIYV" resolve="findLogicalChildren" />
+                            </node>
+                          </node>
+                          <node concept="ANE8D" id="2LNowVOJVb1" role="2OqNvi" />
+                        </node>
+                      </node>
                     </node>
-                    <node concept="2qgKlT" id="2LNowVOJVb0" role="2OqNvi">
-                      <ref role="37wK5l" to="n7tw:7c93VeVMIYV" resolve="findLogicalChildren" />
+                    <node concept="3SKdUt" id="2LNowVOKxjb" role="3cqZAp">
+                      <node concept="1PaTwC" id="2LNowVOKxjc" role="1aUNEU">
+                        <node concept="3oM_SD" id="2LNowVOKxzx" role="1PaTwD">
+                          <property role="3oM_SC" value="the" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKxzz" role="1PaTwD">
+                          <property role="3oM_SC" value="existing" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKxzA" role="1PaTwD">
+                          <property role="3oM_SC" value="two" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKxzE" role="1PaTwD">
+                          <property role="3oM_SC" value="children" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKxzJ" role="1PaTwD">
+                          <property role="3oM_SC" value="must" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKxzP" role="1PaTwD">
+                          <property role="3oM_SC" value="be" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKxzW" role="1PaTwD">
+                          <property role="3oM_SC" value="found." />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKx$4" role="1PaTwD">
+                          <property role="3oM_SC" value="Side" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKx$d" role="1PaTwD">
+                          <property role="3oM_SC" value="effect:" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKx$n" role="1PaTwD">
+                          <property role="3oM_SC" value="cache" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKx$V" role="1PaTwD">
+                          <property role="3oM_SC" value="was" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKx_7" role="1PaTwD">
+                          <property role="3oM_SC" value="built" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKx_k" role="1PaTwD">
+                          <property role="3oM_SC" value="in" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKx_y" role="1PaTwD">
+                          <property role="3oM_SC" value="background" />
+                        </node>
+                      </node>
                     </node>
-                  </node>
-                  <node concept="ANE8D" id="2LNowVOJVb1" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="2LNowVOKxjb" role="3cqZAp">
-              <node concept="1PaTwC" id="2LNowVOKxjc" role="1aUNEU">
-                <node concept="3oM_SD" id="2LNowVOKxzx" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKxzz" role="1PaTwD">
-                  <property role="3oM_SC" value="existing" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKxzA" role="1PaTwD">
-                  <property role="3oM_SC" value="two" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKxzE" role="1PaTwD">
-                  <property role="3oM_SC" value="children" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKxzJ" role="1PaTwD">
-                  <property role="3oM_SC" value="must" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKxzP" role="1PaTwD">
-                  <property role="3oM_SC" value="be" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKxzW" role="1PaTwD">
-                  <property role="3oM_SC" value="found." />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKx$4" role="1PaTwD">
-                  <property role="3oM_SC" value="Side" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKx$d" role="1PaTwD">
-                  <property role="3oM_SC" value="effect:" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKx$n" role="1PaTwD">
-                  <property role="3oM_SC" value="cache" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKx$V" role="1PaTwD">
-                  <property role="3oM_SC" value="was" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKx_7" role="1PaTwD">
-                  <property role="3oM_SC" value="built" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKx_k" role="1PaTwD">
-                  <property role="3oM_SC" value="in" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKx_y" role="1PaTwD">
-                  <property role="3oM_SC" value="background" />
-                </node>
-              </node>
-            </node>
-            <node concept="3vlDli" id="2LNowVOJVb2" role="3cqZAp">
-              <node concept="3cmrfG" id="2LNowVOJVb3" role="3tpDZB">
-                <property role="3cmrfH" value="2" />
-              </node>
-              <node concept="2OqwBi" id="2LNowVOJVb4" role="3tpDZA">
-                <node concept="37vLTw" id="2LNowVOJVb5" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2LNowVOJVaU" resolve="logicalChildren" />
-                </node>
-                <node concept="34oBXx" id="2LNowVOJVb6" role="2OqNvi" />
-              </node>
-              <node concept="3_1$Yv" id="2LNowVOJVb7" role="3_9lra">
-                <node concept="3cpWs3" id="2LNowVOJVb8" role="3_1BAH">
-                  <node concept="2OqwBi" id="2LNowVOJVb9" role="3uHU7w">
-                    <node concept="37vLTw" id="2LNowVOJVba" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2LNowVOJVaU" resolve="logicalChildren" />
+                    <node concept="3vlDli" id="2LNowVOJVb2" role="3cqZAp">
+                      <node concept="3cmrfG" id="2LNowVOJVb3" role="3tpDZB">
+                        <property role="3cmrfH" value="2" />
+                      </node>
+                      <node concept="2OqwBi" id="2LNowVOJVb4" role="3tpDZA">
+                        <node concept="37vLTw" id="2LNowVOJVb5" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2LNowVOJVaU" resolve="logicalChildren" />
+                        </node>
+                        <node concept="34oBXx" id="2LNowVOJVb6" role="2OqNvi" />
+                      </node>
+                      <node concept="3_1$Yv" id="2LNowVOJVb7" role="3_9lra">
+                        <node concept="3cpWs3" id="2LNowVOJVb8" role="3_1BAH">
+                          <node concept="2OqwBi" id="2LNowVOJVb9" role="3uHU7w">
+                            <node concept="37vLTw" id="2LNowVOJVba" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2LNowVOJVaU" resolve="logicalChildren" />
+                            </node>
+                            <node concept="34oBXx" id="2LNowVOJVbb" role="2OqNvi" />
+                          </node>
+                          <node concept="Xl_RD" id="2LNowVOJVbc" role="3uHU7B">
+                            <property role="Xl_RC" value="children was " />
+                          </node>
+                        </node>
+                      </node>
                     </node>
-                    <node concept="34oBXx" id="2LNowVOJVbb" role="2OqNvi" />
-                  </node>
-                  <node concept="Xl_RD" id="2LNowVOJVbc" role="3uHU7B">
-                    <property role="Xl_RC" value="children was " />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="2LNowVOJVbd" role="3cqZAp" />
-            <node concept="3SKdUt" id="2LNowVOKy8d" role="3cqZAp">
-              <node concept="1PaTwC" id="2LNowVOKy8e" role="1aUNEU">
-                <node concept="3oM_SD" id="2LNowVOKyWG" role="1PaTwD">
-                  <property role="3oM_SC" value="Add" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyWI" role="1PaTwD">
-                  <property role="3oM_SC" value="a" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyWL" role="1PaTwD">
-                  <property role="3oM_SC" value="new" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyWP" role="1PaTwD">
-                  <property role="3oM_SC" value="child" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyWU" role="1PaTwD">
-                  <property role="3oM_SC" value="to" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyX0" role="1PaTwD">
-                  <property role="3oM_SC" value="a" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyX7" role="1PaTwD">
-                  <property role="3oM_SC" value="model" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyXf" role="1PaTwD">
-                  <property role="3oM_SC" value="in" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyXo" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyXy" role="1PaTwD">
-                  <property role="3oM_SC" value="same" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKyXH" role="1PaTwD">
-                  <property role="3oM_SC" value="solution" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="2LNowVOJVbe" role="3cqZAp">
-              <node concept="3cpWsn" id="2LNowVOJVbf" role="3cpWs9">
-                <property role="TrG5h" value="bufferPTR" />
-                <node concept="1XwpNF" id="2LNowVOJVbg" role="1tU5fm" />
-                <node concept="1Xw6AR" id="2LNowVOJVbh" role="33vP2m">
-                  <node concept="1dCxOl" id="2LNowVOJVbi" role="1XwpL7">
-                    <property role="1XweGQ" value="r:54ae00bf-b229-40d8-a444-f76ddb35f598" />
-                    <node concept="1j_P7g" id="2LNowVOJVbj" role="1j$8Uc">
-                      <property role="1j_P7h" value="com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.testbuffer" />
+                    <node concept="3clFbH" id="2LNowVOJVbd" role="3cqZAp" />
+                    <node concept="3SKdUt" id="2LNowVOKy8d" role="3cqZAp">
+                      <node concept="1PaTwC" id="2LNowVOKy8e" role="1aUNEU">
+                        <node concept="3oM_SD" id="2LNowVOKyWG" role="1PaTwD">
+                          <property role="3oM_SC" value="Add" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyWI" role="1PaTwD">
+                          <property role="3oM_SC" value="a" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyWL" role="1PaTwD">
+                          <property role="3oM_SC" value="new" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyWP" role="1PaTwD">
+                          <property role="3oM_SC" value="child" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyWU" role="1PaTwD">
+                          <property role="3oM_SC" value="to" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyX0" role="1PaTwD">
+                          <property role="3oM_SC" value="a" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyX7" role="1PaTwD">
+                          <property role="3oM_SC" value="model" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyXf" role="1PaTwD">
+                          <property role="3oM_SC" value="in" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyXo" role="1PaTwD">
+                          <property role="3oM_SC" value="the" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyXy" role="1PaTwD">
+                          <property role="3oM_SC" value="same" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKyXH" role="1PaTwD">
+                          <property role="3oM_SC" value="solution" />
+                        </node>
+                      </node>
                     </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="2LNowVOJVbk" role="3cqZAp">
-              <node concept="37vLTI" id="2LNowVOJVbl" role="3clFbG">
-                <node concept="2OqwBi" id="2LNowVOJVbm" role="37vLTx">
-                  <node concept="37vLTw" id="2LNowVOJVbn" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2LNowVOJVbf" resolve="bufferPTR" />
-                  </node>
-                  <node concept="2yCiCJ" id="2LNowVOJVbo" role="2OqNvi">
-                    <node concept="2OqwBi" id="2LNowVOJVbp" role="Vysub">
-                      <node concept="1jxXqW" id="2LNowVOJVbq" role="2Oq$k0" />
-                      <node concept="liA8E" id="2LNowVOJVbr" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                    <node concept="3cpWs8" id="2LNowVOJVbe" role="3cqZAp">
+                      <node concept="3cpWsn" id="2LNowVOJVbf" role="3cpWs9">
+                        <property role="TrG5h" value="bufferPTR" />
+                        <node concept="1XwpNF" id="2LNowVOJVbg" role="1tU5fm" />
+                        <node concept="1Xw6AR" id="2LNowVOJVbh" role="33vP2m">
+                          <node concept="1dCxOl" id="2LNowVOJVbi" role="1XwpL7">
+                            <property role="1XweGQ" value="r:54ae00bf-b229-40d8-a444-f76ddb35f598" />
+                            <node concept="1j_P7g" id="2LNowVOJVbj" role="1j$8Uc">
+                              <property role="1j_P7h" value="com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.testbuffer" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="2LNowVOJVbs" role="37vLTJ">
-                  <ref role="3cqZAo" node="2LNowVOJVae" resolve="bufferModel" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="2LNowVOJVbu" role="3cqZAp">
-              <node concept="3cpWsn" id="2LNowVOJVbv" role="3cpWs9">
-                <property role="TrG5h" value="newChild" />
-                <node concept="3Tqbb2" id="2LNowVOJVbw" role="1tU5fm">
-                  <ref role="ehGHo" to="legp:jksL7exZEY" resolve="RootNodeWithReferenceToLogicalOwner" />
-                </node>
-                <node concept="2pJPEk" id="2LNowVOJVbx" role="33vP2m">
-                  <node concept="2pJPED" id="2LNowVOJVby" role="2pJPEn">
-                    <ref role="2pJxaS" to="legp:jksL7exZEY" resolve="RootNodeWithReferenceToLogicalOwner" />
-                    <node concept="2pIpSj" id="2LNowVOJVbz" role="2pJxcM">
-                      <ref role="2pIpSl" to="legp:5SdnHczgLRK" resolve="owner" />
-                      <node concept="36biLy" id="2LNowVOJVb$" role="28nt2d">
-                        <node concept="1PxgMI" id="2LNowVOJVb_" role="36biLW">
-                          <node concept="chp4Y" id="2LNowVOJVbA" role="3oSUPX">
-                            <ref role="cht4Q" to="legp:jksL7exYJ9" resolve="NodeWithLogicalChildren" />
+                    <node concept="3clFbF" id="2LNowVOJVbk" role="3cqZAp">
+                      <node concept="37vLTI" id="2LNowVOJVbl" role="3clFbG">
+                        <node concept="2OqwBi" id="2LNowVOJVbm" role="37vLTx">
+                          <node concept="37vLTw" id="2LNowVOJVbn" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2LNowVOJVbf" resolve="bufferPTR" />
                           </node>
-                          <node concept="37vLTw" id="2LNowVOJVbB" role="1m5AlR">
-                            <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                          <node concept="2yCiCJ" id="2LNowVOJVbo" role="2OqNvi">
+                            <node concept="2OqwBi" id="2LNowVOJVbp" role="Vysub">
+                              <node concept="1jxXqW" id="2LNowVOJVbq" role="2Oq$k0" />
+                              <node concept="liA8E" id="2LNowVOJVbr" role="2OqNvi">
+                                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                              </node>
+                            </node>
                           </node>
                         </node>
+                        <node concept="37vLTw" id="2LNowVOJVbs" role="37vLTJ">
+                          <ref role="3cqZAo" node="2LNowVOJVae" resolve="bufferModel" />
+                        </node>
                       </node>
                     </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="2LNowVOJVbC" role="3cqZAp">
-              <node concept="2OqwBi" id="2LNowVOJVbD" role="3clFbG">
-                <node concept="37vLTw" id="2LNowVOJVbE" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2LNowVOJVae" resolve="bufferModel" />
-                </node>
-                <node concept="3BYIHo" id="2LNowVOJVbF" role="2OqNvi">
-                  <node concept="37vLTw" id="2LNowVOJVbG" role="3BYIHq">
-                    <ref role="3cqZAo" node="2LNowVOJVbv" resolve="newChild" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="2LNowVOJVbH" role="3cqZAp" />
-            <node concept="3clFbH" id="2LNowVOJVbI" role="3cqZAp" />
-            <node concept="3cpWs8" id="2LNowVOJVbJ" role="3cqZAp">
-              <node concept="3cpWsn" id="2LNowVOJVbK" role="3cpWs9">
-                <property role="TrG5h" value="logicalChildren2" />
-                <node concept="_YKpA" id="2LNowVOJVbL" role="1tU5fm">
-                  <node concept="3Tqbb2" id="2LNowVOJVbM" role="_ZDj9">
-                    <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="2LNowVOJVbN" role="33vP2m">
-                  <node concept="2OqwBi" id="2LNowVOJVbO" role="2Oq$k0">
-                    <node concept="37vLTw" id="2LNowVOJVbP" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                    <node concept="3cpWs8" id="2LNowVOJVbu" role="3cqZAp">
+                      <node concept="3cpWsn" id="2LNowVOJVbv" role="3cpWs9">
+                        <property role="TrG5h" value="newChild" />
+                        <node concept="3Tqbb2" id="2LNowVOJVbw" role="1tU5fm">
+                          <ref role="ehGHo" to="legp:jksL7exZEY" resolve="RootNodeWithReferenceToLogicalOwner" />
+                        </node>
+                        <node concept="2pJPEk" id="2LNowVOJVbx" role="33vP2m">
+                          <node concept="2pJPED" id="2LNowVOJVby" role="2pJPEn">
+                            <ref role="2pJxaS" to="legp:jksL7exZEY" resolve="RootNodeWithReferenceToLogicalOwner" />
+                            <node concept="2pIpSj" id="2LNowVOJVbz" role="2pJxcM">
+                              <ref role="2pIpSl" to="legp:5SdnHczgLRK" resolve="owner" />
+                              <node concept="36biLy" id="2LNowVOJVb$" role="28nt2d">
+                                <node concept="1PxgMI" id="2LNowVOJVb_" role="36biLW">
+                                  <node concept="chp4Y" id="2LNowVOJVbA" role="3oSUPX">
+                                    <ref role="cht4Q" to="legp:jksL7exYJ9" resolve="NodeWithLogicalChildren" />
+                                  </node>
+                                  <node concept="37vLTw" id="2LNowVOJVbB" role="1m5AlR">
+                                    <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
-                    <node concept="2qgKlT" id="2LNowVOJVbQ" role="2OqNvi">
-                      <ref role="37wK5l" to="n7tw:7c93VeVMIYV" resolve="findLogicalChildren" />
+                    <node concept="3clFbF" id="2LNowVOJVbC" role="3cqZAp">
+                      <node concept="2OqwBi" id="2LNowVOJVbD" role="3clFbG">
+                        <node concept="37vLTw" id="2LNowVOJVbE" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2LNowVOJVae" resolve="bufferModel" />
+                        </node>
+                        <node concept="3BYIHo" id="2LNowVOJVbF" role="2OqNvi">
+                          <node concept="37vLTw" id="2LNowVOJVbG" role="3BYIHq">
+                            <ref role="3cqZAo" node="2LNowVOJVbv" resolve="newChild" />
+                          </node>
+                        </node>
+                      </node>
                     </node>
-                  </node>
-                  <node concept="ANE8D" id="2LNowVOJVbR" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="2LNowVOKzkG" role="3cqZAp">
-              <node concept="1PaTwC" id="2LNowVOKzkH" role="1aUNEU">
-                <node concept="3oM_SD" id="2LNowVOKz_u" role="1PaTwD">
-                  <property role="3oM_SC" value="The" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKz_w" role="1PaTwD">
-                  <property role="3oM_SC" value="new" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKz_z" role="1PaTwD">
-                  <property role="3oM_SC" value="child" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKz_B" role="1PaTwD">
-                  <property role="3oM_SC" value="is" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKz_G" role="1PaTwD">
-                  <property role="3oM_SC" value="not" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKz_M" role="1PaTwD">
-                  <property role="3oM_SC" value="found" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKz_T" role="1PaTwD">
-                  <property role="3oM_SC" value="as" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKzA1" role="1PaTwD">
-                  <property role="3oM_SC" value="still" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKzAa" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKzAk" role="1PaTwD">
-                  <property role="3oM_SC" value="Cache" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKzAv" role="1PaTwD">
-                  <property role="3oM_SC" value="is" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOKzAF" role="1PaTwD">
-                  <property role="3oM_SC" value="used" />
-                </node>
-              </node>
-            </node>
-            <node concept="3vlDli" id="2LNowVOJVbS" role="3cqZAp">
-              <node concept="3cmrfG" id="2LNowVOJVbT" role="3tpDZB">
-                <property role="3cmrfH" value="2" />
-              </node>
-              <node concept="2OqwBi" id="2LNowVOJVbU" role="3tpDZA">
-                <node concept="37vLTw" id="2LNowVOJVbV" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2LNowVOJVbK" resolve="logicalChildren2" />
-                </node>
-                <node concept="34oBXx" id="2LNowVOJVbW" role="2OqNvi" />
-              </node>
-              <node concept="3_1$Yv" id="2LNowVOJVbX" role="3_9lra">
-                <node concept="3cpWs3" id="2LNowVOJVbY" role="3_1BAH">
-                  <node concept="2OqwBi" id="2LNowVOJVbZ" role="3uHU7w">
-                    <node concept="37vLTw" id="2LNowVOJVc0" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2LNowVOJVbK" resolve="logicalChildren2" />
+                    <node concept="3clFbH" id="2LNowVOJVbH" role="3cqZAp" />
+                    <node concept="3clFbH" id="2LNowVOJVbI" role="3cqZAp" />
+                    <node concept="3cpWs8" id="2LNowVOJVbJ" role="3cqZAp">
+                      <node concept="3cpWsn" id="2LNowVOJVbK" role="3cpWs9">
+                        <property role="TrG5h" value="logicalChildren2" />
+                        <node concept="_YKpA" id="2LNowVOJVbL" role="1tU5fm">
+                          <node concept="3Tqbb2" id="2LNowVOJVbM" role="_ZDj9">
+                            <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="2LNowVOJVbN" role="33vP2m">
+                          <node concept="2OqwBi" id="2LNowVOJVbO" role="2Oq$k0">
+                            <node concept="37vLTw" id="2LNowVOJVbP" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2LNowVOJVaL" resolve="ilco" />
+                            </node>
+                            <node concept="2qgKlT" id="2LNowVOJVbQ" role="2OqNvi">
+                              <ref role="37wK5l" to="n7tw:7c93VeVMIYV" resolve="findLogicalChildren" />
+                            </node>
+                          </node>
+                          <node concept="ANE8D" id="2LNowVOJVbR" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3SKdUt" id="2LNowVOKzkG" role="3cqZAp">
+                      <node concept="1PaTwC" id="2LNowVOKzkH" role="1aUNEU">
+                        <node concept="3oM_SD" id="2LNowVOKz_u" role="1PaTwD">
+                          <property role="3oM_SC" value="The" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKz_w" role="1PaTwD">
+                          <property role="3oM_SC" value="new" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKz_z" role="1PaTwD">
+                          <property role="3oM_SC" value="child" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKz_B" role="1PaTwD">
+                          <property role="3oM_SC" value="is" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKz_G" role="1PaTwD">
+                          <property role="3oM_SC" value="not" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKz_M" role="1PaTwD">
+                          <property role="3oM_SC" value="found" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKz_T" role="1PaTwD">
+                          <property role="3oM_SC" value="as" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKzA1" role="1PaTwD">
+                          <property role="3oM_SC" value="still" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKzAa" role="1PaTwD">
+                          <property role="3oM_SC" value="the" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKzAk" role="1PaTwD">
+                          <property role="3oM_SC" value="Cache" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKzAv" role="1PaTwD">
+                          <property role="3oM_SC" value="is" />
+                        </node>
+                        <node concept="3oM_SD" id="2LNowVOKzAF" role="1PaTwD">
+                          <property role="3oM_SC" value="used" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3vlDli" id="2LNowVOJVbS" role="3cqZAp">
+                      <node concept="3cmrfG" id="2LNowVOJVbT" role="3tpDZB">
+                        <property role="3cmrfH" value="2" />
+                      </node>
+                      <node concept="2OqwBi" id="2LNowVOJVbU" role="3tpDZA">
+                        <node concept="37vLTw" id="2LNowVOJVbV" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2LNowVOJVbK" resolve="logicalChildren2" />
+                        </node>
+                        <node concept="34oBXx" id="2LNowVOJVbW" role="2OqNvi" />
+                      </node>
+                      <node concept="3_1$Yv" id="2LNowVOJVbX" role="3_9lra">
+                        <node concept="3cpWs3" id="2LNowVOJVbY" role="3_1BAH">
+                          <node concept="2OqwBi" id="2LNowVOJVbZ" role="3uHU7w">
+                            <node concept="37vLTw" id="2LNowVOJVc0" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2LNowVOJVbK" resolve="logicalChildren2" />
+                            </node>
+                            <node concept="34oBXx" id="2LNowVOJVc1" role="2OqNvi" />
+                          </node>
+                          <node concept="Xl_RD" id="2LNowVOJVc2" role="3uHU7B">
+                            <property role="Xl_RC" value="children was " />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="4dKV7gVcpL_" role="3cqZAp">
+                      <node concept="10Nm6u" id="4dKV7gVcpLz" role="3clFbG" />
                     </node>
-                    <node concept="34oBXx" id="2LNowVOJVc1" role="2OqNvi" />
-                  </node>
-                  <node concept="Xl_RD" id="2LNowVOJVc2" role="3uHU7B">
-                    <property role="Xl_RC" value="children was " />
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="2LNowVOKzRQ" role="3cqZAp">
-              <node concept="1PaTwC" id="2LNowVOKzRR" role="1aUNEU">
-                <node concept="3oM_SD" id="2LNowVOK$8Q" role="1PaTwD">
-                  <property role="3oM_SC" value="Remove" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOK$8S" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="2LNowVOK$8V" role="1PaTwD">
-                  <property role="3oM_SC" value="cache" />
+                <node concept="3uibUv" id="4dKV7gVcqr4" role="3PaCim">
+                  <ref role="3uigEE" to="wyt6:~Void" resolve="Void" />
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="2LNowVOJX3x" role="3cqZAp">
-              <node concept="2YIFZM" id="2LNowVOJXrA" role="3clFbG">
-                <ref role="37wK5l" to="n7tw:6aYyEt27DQJ" resolve="stopUsingCache" />
-                <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
-              </node>
-            </node>
             <node concept="3clFbH" id="2LNowVOJWRl" role="3cqZAp" />
             <node concept="3cpWs8" id="2LNowVOK1k8" role="3cqZAp">
               <node concept="3cpWsn" id="2LNowVOK1k9" role="3cpWs9">
@@ -790,6 +789,9 @@
           </node>
         </node>
       </node>
+      <node concept="3uibUv" id="4dKV7gVcqJE" role="Sfmx6">
+        <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+      </node>
     </node>
   </node>
   <node concept="2XOHcx" id="4Ijegxhuddk">

From ba37d28314f69a11df34596eb23be41df663e2bc Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Mon, 14 Oct 2024 10:22:08 +0200
Subject: [PATCH 10/15] fix builf-test solution (#2547)

---
 .../com.mbeddr.platform.tests.build.mps       | 262 +++++++++---------
 1 file changed, 138 insertions(+), 124 deletions(-)

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
index 4e853efca01..712cd6f2bee 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
@@ -368,6 +368,12 @@
       <node concept="L2wRC" id="4JHJliM0gol" role="39821P">
         <ref role="L2wRA" node="4JHJliM0g2K" resolve="test.com.mbeddr.mpsutil.ecore.modelImportExport" />
       </node>
+      <node concept="L2wRC" id="6n0otOpma6w" role="39821P">
+        <ref role="L2wRA" node="6n0otOpkvEj" resolve="com.mbeddr.mpsutil.logicalChild.sandbox" />
+      </node>
+      <node concept="L2wRC" id="6n0otOpmcXq" role="39821P">
+        <ref role="L2wRA" node="6n0otOpkQ9s" resolve="test.com.mbeddr.mpsutil.logicalChild" />
+      </node>
       <node concept="398223" id="2GRHOLIUBUT" role="39821P">
         <node concept="3_J27D" id="2GRHOLIUBUV" role="Nbhlr">
           <node concept="3Mxwew" id="2GRHOLIUC5d" role="3MwsjC">
@@ -427,130 +433,6 @@
     </node>
     <node concept="2G$12M" id="7eF9rfAnzVd" role="3989C9">
       <property role="TrG5h" value="com.mbeddr.platform.tests" />
-      <node concept="1E1JtA" id="2LNowVOKCVI" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="test.com.mbeddr.mpsutil.logicalChild" />
-        <property role="3LESm3" value="943c7443-45f4-48a4-a282-49cc46ddc1bf" />
-        <node concept="398BVA" id="2LNowVOKD8$" role="3LF7KH">
-          <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
-          <node concept="2Ry0Ak" id="2LNowVOKDji" role="iGT6I">
-            <property role="2Ry0Am" value="solutions" />
-            <node concept="2Ry0Ak" id="2LNowVOKDjZ" role="2Ry0An">
-              <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
-              <node concept="2Ry0Ak" id="2LNowVOKDm2" role="2Ry0An">
-                <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild.msd" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2LNowVOKDmI" role="3bR37C">
-          <node concept="3bR9La" id="2LNowVOKDmJ" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1BupzO" id="2LNowVOKDn2" role="3bR31x">
-          <property role="3ZfqAx" value="models" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="2LNowVOKDn3" role="1HemKq">
-            <node concept="398BVA" id="2LNowVOKDmK" role="3LXTmr">
-              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
-              <node concept="2Ry0Ak" id="2LNowVOKDmL" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="2LNowVOKDmM" role="2Ry0An">
-                  <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
-                  <node concept="2Ry0Ak" id="2LNowVOKDmN" role="2Ry0An">
-                    <property role="2Ry0Am" value="models" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="2LNowVOKDn4" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2LNowVOKECZ" role="3bR37C">
-          <node concept="3bR9La" id="2LNowVOKED0" role="1SiIV1">
-            <ref role="3bR37D" node="2LNowVOKDWi" resolve="com.mbeddr.mpsutil.logicalChild.sandbox" />
-          </node>
-        </node>
-      </node>
-      <node concept="1E1JtD" id="2LNowVOKDWi" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
-        <property role="3LESm3" value="286e2375-00e3-4042-b083-84873dd623be" />
-        <node concept="398BVA" id="2LNowVOKEls" role="3LF7KH">
-          <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
-          <node concept="2Ry0Ak" id="2LNowVOKEny" role="iGT6I">
-            <property role="2Ry0Am" value="languages" />
-            <node concept="2Ry0Ak" id="2LNowVOKEpB" role="2Ry0An">
-              <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
-              <node concept="2Ry0Ak" id="2LNowVOKEr2" role="2Ry0An">
-                <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox.mpl" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2LNowVOKEs1" role="3bR37C">
-          <node concept="3bR9La" id="2LNowVOKEs2" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2LNowVOKEs3" role="3bR37C">
-          <node concept="3bR9La" id="2LNowVOKEs4" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2LNowVOKEs5" role="3bR37C">
-          <node concept="3bR9La" id="2LNowVOKEs6" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
-          </node>
-        </node>
-        <node concept="1BupzO" id="2LNowVOKEsp" role="3bR31x">
-          <property role="3ZfqAx" value="models" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="2LNowVOKEsq" role="1HemKq">
-            <node concept="398BVA" id="2LNowVOKEs7" role="3LXTmr">
-              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
-              <node concept="2Ry0Ak" id="2LNowVOKEs8" role="iGT6I">
-                <property role="2Ry0Am" value="languages" />
-                <node concept="2Ry0Ak" id="2LNowVOKEs9" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
-                  <node concept="2Ry0Ak" id="2LNowVOKEsa" role="2Ry0An">
-                    <property role="2Ry0Am" value="models" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="2LNowVOKEsr" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2LNowVOKEss" role="3bR37C">
-          <node concept="1Busua" id="2LNowVOKEst" role="1SiIV1">
-            <ref role="1Busuk" to="al5i:3lcj7hzsmpl" resolve="com.mbeddr.mpsutil.logicalChild" />
-          </node>
-        </node>
-        <node concept="3rtmxn" id="2LNowVOKEPq" role="3bR31x">
-          <node concept="3LXTmp" id="2LNowVOKEPr" role="3rtmxm">
-            <node concept="398BVA" id="2LNowVOKEPs" role="3LXTmr">
-              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
-              <node concept="2Ry0Ak" id="2LNowVOKEPt" role="iGT6I">
-                <property role="2Ry0Am" value="languages" />
-                <node concept="2Ry0Ak" id="2LNowVOKEPu" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="2LNowVOKEPw" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="1E1JtA" id="75qFqB43e5u" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="tests.com.mbeddr.mpsutil.json" />
@@ -1641,6 +1523,11 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
+        <node concept="1SiIV0" id="bHMJKhDDf7" role="3bR37C">
+          <node concept="3bR9La" id="bHMJKhDDf8" role="1SiIV1">
+            <ref role="3bR37D" to="al5i:776vT$mQZbf" resolve="com.mbeddr.mpsutil.comparator" />
+          </node>
+        </node>
         <node concept="1SiIV0" id="bHMJKhDDf9" role="3bR37C">
           <node concept="3bR9La" id="bHMJKhDDfa" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
@@ -1696,6 +1583,21 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="bHMJKhDDfb" role="3bR37C">
+          <node concept="3bR9La" id="bHMJKhDDfc" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="bHMJKhDDfd" role="3bR37C">
+          <node concept="3bR9La" id="bHMJKhDDfe" role="1SiIV1">
+            <ref role="3bR37D" to="al5i:vOGyTeKPEA" resolve="com.mbeddr.mpsutil.ecore.testing" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="bHMJKhDDff" role="3bR37C">
+          <node concept="3bR9La" id="bHMJKhDDfg" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4JHJliM0jp_" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2841,6 +2743,115 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtA" id="6n0otOpkQ9s" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="test.com.mbeddr.mpsutil.logicalChild" />
+        <property role="3LESm3" value="943c7443-45f4-48a4-a282-49cc46ddc1bf" />
+        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <node concept="398BVA" id="6n0otOpkRio" role="3LF7KH">
+          <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+          <node concept="2Ry0Ak" id="6n0otOpkTbm" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="6n0otOpkV4X" role="2Ry0An">
+              <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
+              <node concept="2Ry0Ak" id="6n0otOpkZvd" role="2Ry0An">
+                <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6n0otOpl0Aw" role="3bR37C">
+          <node concept="3bR9La" id="6n0otOpl0Ax" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6n0otOpl0Ay" role="3bR37C">
+          <node concept="3bR9La" id="6n0otOpl0Az" role="1SiIV1">
+            <ref role="3bR37D" node="6n0otOpkvEj" resolve="com.mbeddr.mpsutil.logicalChild.sandbox" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="6n0otOpl0AQ" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="6n0otOpl0AR" role="1HemKq">
+            <node concept="398BVA" id="6n0otOpl0A$" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="6n0otOpl0A_" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="6n0otOpl0AA" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
+                  <node concept="2Ry0Ak" id="6n0otOpl0AB" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="6n0otOpl0AS" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="6n0otOpkvEj" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
+        <property role="3LESm3" value="286e2375-00e3-4042-b083-84873dd623be" />
+        <node concept="398BVA" id="6n0otOpkwJe" role="3LF7KH">
+          <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+          <node concept="2Ry0Ak" id="6n0otOpkywM" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="6n0otOpk$iZ" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
+              <node concept="2Ry0Ak" id="6n0otOpkA4y" role="2Ry0An">
+                <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6n0otOpkB88" role="3bR37C">
+          <node concept="3bR9La" id="6n0otOpkB89" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6n0otOpkB8a" role="3bR37C">
+          <node concept="3bR9La" id="6n0otOpkB8b" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6n0otOpkB8c" role="3bR37C">
+          <node concept="3bR9La" id="6n0otOpkB8d" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="6n0otOpkB8w" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="6n0otOpkB8x" role="1HemKq">
+            <node concept="398BVA" id="6n0otOpkB8e" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="6n0otOpkB8f" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="6n0otOpkB8g" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
+                  <node concept="2Ry0Ak" id="6n0otOpkB8h" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="6n0otOpkB8y" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6n0otOpkB8z" role="3bR37C">
+          <node concept="1Busua" id="6n0otOpkB8$" role="1SiIV1">
+            <ref role="1Busuk" to="al5i:3lcj7hzsmpl" resolve="com.mbeddr.mpsutil.logicalChild" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2G$12M" id="4pIcGABAyzC" role="3989C9">
       <property role="TrG5h" value="com.mbeddr.doc.tests" />
@@ -2989,6 +3000,9 @@
       <node concept="22LTRM" id="4JHJliM0gmY" role="22LTRK">
         <ref role="22LTRN" node="4JHJliM0g2K" resolve="test.com.mbeddr.mpsutil.ecore.modelImportExport" />
       </node>
+      <node concept="22LTRM" id="6n0otOpmfAs" role="22LTRK">
+        <ref role="22LTRN" node="6n0otOpkQ9s" resolve="test.com.mbeddr.mpsutil.logicalChild" />
+      </node>
     </node>
     <node concept="2igEWh" id="3HpWboH_Z$G" role="1hWBAP">
       <property role="2igJW4" value="true" />

From 883b2ec084ea0353c3ddebcb0ad269bdf5a0f429 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Mon, 14 Oct 2024 11:38:07 +0200
Subject: [PATCH 11/15] migrate remigrate (#2547)

---
 .../com.mbeddr.platform.tests.build.mps       | 32 +++++++++++++++++++
 ...m.mbeddr.mpsutil.logicalChild.behavior.mps |  2 +-
 ...mbeddr.mpsutil.logicalChild.test@tests.mps |  4 +--
 .../test.com.mbeddr.mpsutil.logicalChild.msd  |  1 +
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
index 712cd6f2bee..0c365eb2b5f 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
@@ -2792,6 +2792,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="3WyAxHbtRcO" role="3bR31x">
+          <node concept="3LXTmp" id="3WyAxHbtRcP" role="3rtmxm">
+            <node concept="3qWCbU" id="3WyAxHbtRcQ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="3WyAxHbtRcR" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="3WyAxHbtRcS" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="3WyAxHbtRcT" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6n0otOpkvEj" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2851,6 +2867,22 @@
             <ref role="1Busuk" to="al5i:3lcj7hzsmpl" resolve="com.mbeddr.mpsutil.logicalChild" />
           </node>
         </node>
+        <node concept="3rtmxn" id="3WyAxHbtRcV" role="3bR31x">
+          <node concept="3LXTmp" id="3WyAxHbtRcW" role="3rtmxm">
+            <node concept="3qWCbU" id="3WyAxHbtRcX" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="3WyAxHbtRcY" role="3LXTmr">
+              <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
+              <node concept="2Ry0Ak" id="3WyAxHbtRcZ" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="3WyAxHbtRd0" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="4pIcGABAyzC" role="3989C9">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index 710bebb7a01..843419dffa1 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -817,7 +817,7 @@
             <node concept="3cpWs6" id="4dKV7gVclRJ" role="3cqZAp">
               <node concept="2OqwBi" id="4dKV7gVcowk" role="3cqZAk">
                 <node concept="37vLTw" id="4dKV7gVcowl" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4dKV7gVaIMG" resolve="runnable" />
+                  <ref role="3cqZAo" node="4dKV7gVaIMG" resolve="codeToBeRun" />
                 </node>
                 <node concept="liA8E" id="4dKV7gVcowm" role="2OqNvi">
                   <ref role="37wK5l" to="5zyv:~Callable.call()" resolve="call" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
index 4bd6fa3cc45..397e7167a19 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
@@ -706,7 +706,7 @@
               </node>
               <node concept="2OqwBi" id="2LNowVOK1kj" role="3tpDZA">
                 <node concept="37vLTw" id="2LNowVOK1kk" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2LNowVOK1k9" resolve="logicalChildren2" />
+                  <ref role="3cqZAo" node="2LNowVOK1k9" resolve="logicalChildren3" />
                 </node>
                 <node concept="34oBXx" id="2LNowVOK1kl" role="2OqNvi" />
               </node>
@@ -714,7 +714,7 @@
                 <node concept="3cpWs3" id="2LNowVOK1kn" role="3_1BAH">
                   <node concept="2OqwBi" id="2LNowVOK1ko" role="3uHU7w">
                     <node concept="37vLTw" id="2LNowVOK1kp" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2LNowVOK1k9" resolve="logicalChildren2" />
+                      <ref role="3cqZAo" node="2LNowVOK1k9" resolve="logicalChildren3" />
                     </node>
                     <node concept="34oBXx" id="2LNowVOK1kq" role="2OqNvi" />
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd
index 87a2a871040..17113629f5b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd
@@ -9,6 +9,7 @@
     <facet compile="mps" classes="mps" ext="no" type="java">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>

From 2e36d70e180d99a55ab842b5677567d4d32f2f6c Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 14 Oct 2024 13:49:08 +0200
Subject: [PATCH 12/15] fix typos

---
 .../models/com.mbeddr.mpsutil.logicalChild.behavior.mps       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index 843419dffa1..98060a40874 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -542,7 +542,7 @@
           <node concept="1dT_AC" id="6aYyEt2cNss" role="1dT_Ay" />
         </node>
         <node concept="x79VA" id="6aYyEt2cNst" role="3nqlJM">
-          <property role="x79VB" value="modelsl where logical children are" />
+          <property role="x79VB" value="models where logical children are" />
         </node>
       </node>
     </node>
@@ -600,7 +600,7 @@
           </node>
         </node>
         <node concept="x79VA" id="6aYyEt2cN3t" role="3nqlJM">
-          <property role="x79VB" value="moduels where the logical children are to be searched" />
+          <property role="x79VB" value="modules where the logical children are to be searched" />
         </node>
       </node>
     </node>

From 362f524b0408c14018b64c7851e19b5f8b36b04c Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 14 Oct 2024 14:55:30 +0200
Subject: [PATCH 13/15] refactor the code

---
 ...m.mbeddr.mpsutil.logicalChild.behavior.mps |  68 +------
 ...mbeddr.mpsutil.logicalChild.test@tests.mps | 181 +++++++++++++++++-
 2 files changed, 183 insertions(+), 66 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
index 98060a40874..08cbfb88132 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/models/com.mbeddr.mpsutil.logicalChild.behavior.mps
@@ -108,9 +108,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -736,20 +734,6 @@
   <node concept="312cEu" id="44INz$MLbE3">
     <property role="TrG5h" value="LogicalChildOwnerUtil" />
     <node concept="2tJIrI" id="7LqGxA8Cw8j" role="jymVt" />
-    <node concept="Wx3nA" id="44INz$MMr45" role="jymVt">
-      <property role="TrG5h" value="useCache" />
-      <node concept="10P_77" id="6aYyEt26VdI" role="1tU5fm" />
-      <node concept="3Tm6S6" id="6aYyEt1FNHL" role="1B3o_S" />
-      <node concept="3clFbT" id="6aYyEt26Wdb" role="33vP2m" />
-      <node concept="z59LJ" id="6aYyEt27M$Q" role="lGtFl">
-        <node concept="TZ5HA" id="6aYyEt27M$R" role="TZ5H$">
-          <node concept="1dT_AC" id="6aYyEt27M$S" role="1dT_Ay">
-            <property role="1dT_AB" value="Indicates if caching should be applied" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6aYyEt27NXn" role="jymVt" />
     <node concept="Wx3nA" id="7LqGxA8AYpj" role="jymVt">
       <property role="TrG5h" value="module2LogicalChildCache" />
       <node concept="3uibUv" id="7LqGxA8AYxK" role="1tU5fm">
@@ -793,7 +777,6 @@
           <ref role="37wK5l" to="17wx:~ReentrantLock.&lt;init&gt;()" resolve="ReentrantLock" />
         </node>
       </node>
-      <node concept="3Tm6S6" id="6aYyEt1EjIt" role="1B3o_S" />
       <node concept="z59LJ" id="6aYyEt27TUB" role="lGtFl">
         <node concept="TZ5HA" id="6aYyEt27TUC" role="TZ5H$">
           <node concept="1dT_AC" id="6aYyEt27TUD" role="1dT_Ay">
@@ -801,6 +784,7 @@
           </node>
         </node>
       </node>
+      <node concept="3Tm6S6" id="6aYyEt1EjIt" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7LqGxA8AZ1u" role="jymVt" />
     <node concept="2tJIrI" id="7LqGxA8CBz9" role="jymVt" />
@@ -897,16 +881,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6aYyEt27BpF" role="3cqZAp">
-          <node concept="37vLTI" id="6aYyEt27BpG" role="3clFbG">
-            <node concept="3clFbT" id="6aYyEt27BpH" role="37vLTx">
-              <property role="3clFbU" value="true" />
-            </node>
-            <node concept="37vLTw" id="6aYyEt27BpI" role="37vLTJ">
-              <ref role="3cqZAo" node="44INz$MMr45" resolve="useCache" />
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="3cqZAl" id="6aYyEt27Bp$" role="3clF45" />
       <node concept="3Tm6S6" id="4dKV7gVjdD_" role="1B3o_S" />
@@ -922,24 +896,6 @@
     <node concept="2YIFZL" id="6aYyEt27DQJ" role="jymVt">
       <property role="TrG5h" value="stopUsingCache" />
       <node concept="3clFbS" id="6aYyEt27DQN" role="3clF47">
-        <node concept="3clFbF" id="6aYyEt27DQO" role="3cqZAp">
-          <node concept="2OqwBi" id="6aYyEt27DQP" role="3clFbG">
-            <node concept="37vLTw" id="6aYyEt27DQQ" role="2Oq$k0">
-              <ref role="3cqZAo" node="6aYyEt1EjIo" resolve="lock" />
-            </node>
-            <node concept="liA8E" id="6aYyEt27DQR" role="2OqNvi">
-              <ref role="37wK5l" to="17wx:~ReentrantLock.lock()" resolve="lock" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6aYyEt27DQS" role="3cqZAp">
-          <node concept="37vLTI" id="6aYyEt27DQT" role="3clFbG">
-            <node concept="3clFbT" id="6aYyEt27DQU" role="37vLTx" />
-            <node concept="37vLTw" id="6aYyEt27DQV" role="37vLTJ">
-              <ref role="3cqZAo" node="44INz$MMr45" resolve="useCache" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="6aYyEt27DQW" role="3cqZAp">
           <node concept="2OqwBi" id="6aYyEt27DQX" role="3clFbG">
             <node concept="37vLTw" id="6aYyEt27DQY" role="2Oq$k0">
@@ -980,20 +936,16 @@
             <node concept="37vLTw" id="6aYyEt2cdnp" role="2Oq$k0">
               <ref role="3cqZAo" node="6aYyEt1EjIo" resolve="lock" />
             </node>
-            <node concept="liA8E" id="6aYyEt2ce7l" role="2OqNvi">
-              <ref role="37wK5l" to="17wx:~ReentrantLock.lock()" resolve="lock" />
+            <node concept="liA8E" id="6hawlnuB3r0" role="2OqNvi">
+              <ref role="37wK5l" to="17wx:~ReentrantLock.isHeldByCurrentThread()" resolve="isHeldByCurrentThread" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7LqGxA8GqrK" role="3cqZAp">
-          <node concept="37vLTw" id="7LqGxA8GqrM" role="3clFbG">
-            <ref role="3cqZAo" node="44INz$MMr45" resolve="useCache" />
-          </node>
-        </node>
       </node>
       <node concept="3uibUv" id="7LqGxA8Gt3c" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
       </node>
+      <node concept="3Tm1VV" id="6hawlnuBx6L" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7LqGxA8CUGm" role="jymVt" />
     <node concept="2YIFZL" id="6aYyEt1F6sz" role="jymVt">
@@ -1014,16 +966,6 @@
       </node>
       <node concept="3clFbS" id="6aYyEt1F6sB" role="3clF47">
         <node concept="3clFbH" id="6aYyEt1FRWc" role="3cqZAp" />
-        <node concept="3clFbF" id="6aYyEt1EsJj" role="3cqZAp">
-          <node concept="2OqwBi" id="6aYyEt1EsJk" role="3clFbG">
-            <node concept="37vLTw" id="6aYyEt1FSbC" role="2Oq$k0">
-              <ref role="3cqZAo" node="6aYyEt1EjIo" resolve="lock" />
-            </node>
-            <node concept="liA8E" id="6aYyEt1EsJl" role="2OqNvi">
-              <ref role="37wK5l" to="17wx:~ReentrantLock.lock()" resolve="lock" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="6aYyEt1FnTY" role="3cqZAp">
           <node concept="2OqwBi" id="6aYyEt1F_jd" role="3clFbG">
             <node concept="2OqwBi" id="6aYyEt1FoeH" role="2Oq$k0">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
index 397e7167a19..1153a0f1872 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
@@ -11,10 +11,12 @@
   </languages>
   <imports>
     <import index="n7tw" ref="r:e9fcc9c2-114c-4ba2-897c-9e44451eea40(com.mbeddr.mpsutil.logicalChild.behavior)" />
+    <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
+    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
     <import index="xxir" ref="r:a615bfc0-ceb2-486e-85b1-8debbfdfdbb6(com.mbeddr.mpsutil.logicalChild.structure)" implicit="true" />
-    <import index="legp" ref="r:e06fc7a9-6c1d-4d1e-abb5-eda20a08c26c(com.mbeddr.mpsutil.logicalChild.sandbox.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="legp" ref="r:e06fc7a9-6c1d-4d1e-abb5-eda20a08c26c(com.mbeddr.mpsutil.logicalChild.sandbox.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -35,20 +37,38 @@
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
+        <child id="8118189177080264854" name="alternative" index="nSUat" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
+        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
+        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="4952749571008284462" name="jetbrains.mps.baseLanguage.structure.CatchVariable" flags="ng" index="XOnhg" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
+        <child id="1164991057263" name="throwable" index="YScLw" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -73,6 +93,9 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
@@ -90,6 +113,7 @@
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
       </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -97,11 +121,16 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="3093926081414150598" name="jetbrains.mps.baseLanguage.structure.MultipleCatchClause" flags="ng" index="3uVAMA">
+        <child id="8276990574895933173" name="catchBody" index="1zc67A" />
+        <child id="8276990574895933172" name="throwable" index="1zc67B" />
+      </concept>
       <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
+        <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
         <child id="8276990574886367509" name="finallyClause" index="1zxBo6" />
         <child id="8276990574886367508" name="body" index="1zxBo7" />
       </concept>
@@ -146,6 +175,12 @@
         <child id="8427750732757990724" name="expected" index="3tpDZB" />
       </concept>
       <concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
+      </concept>
+      <concept id="1171983834376" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertFalse" flags="nn" index="3vFxKo">
+        <child id="1171983854940" name="condition" index="3vFALc" />
+      </concept>
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
@@ -316,7 +351,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="2LNowVOKuJU" role="3cqZAp" />
             <node concept="3SKdUt" id="3kJ7$$sNLkj" role="3cqZAp">
               <node concept="1PaTwC" id="3kJ7$$sNLkk" role="1aUNEU">
                 <node concept="3oM_SD" id="2LNowVOKwoG" role="1PaTwD">
@@ -339,7 +373,142 @@
                 <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
                 <node concept="1bVj0M" id="4dKV7gVb4hn" role="37wK5m">
                   <node concept="3clFbS" id="4dKV7gVb4ho" role="1bW5cS">
-                    <node concept="3clFbH" id="4dKV7gVb4$Q" role="3cqZAp" />
+                    <node concept="3vwNmj" id="6hawlnuBqR4" role="3cqZAp">
+                      <node concept="2YIFZM" id="7LqGxA8Gs8m" role="3vwVQn">
+                        <ref role="37wK5l" to="n7tw:7LqGxA8GqrF" resolve="shouldUseCache" />
+                        <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="6hawlnuC1qS" role="3cqZAp" />
+                    <node concept="3cpWs8" id="6hawlnuCfpt" role="3cqZAp">
+                      <node concept="3cpWsn" id="6hawlnuCfpu" role="3cpWs9">
+                        <property role="TrG5h" value="otherThreadFailed" />
+                        <node concept="3uibUv" id="6hawlnuCfpv" role="1tU5fm">
+                          <ref role="3uigEE" to="i5cy:~AtomicBoolean" resolve="AtomicBoolean" />
+                        </node>
+                        <node concept="2ShNRf" id="6hawlnuCfIg" role="33vP2m">
+                          <node concept="1pGfFk" id="6hawlnuCgDK" role="2ShVmc">
+                            <property role="373rjd" value="true" />
+                            <ref role="37wK5l" to="i5cy:~AtomicBoolean.&lt;init&gt;(boolean)" resolve="AtomicBoolean" />
+                            <node concept="3clFbT" id="6hawlnuCh14" role="37wK5m" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="6hawlnuCi_I" role="3cqZAp">
+                      <node concept="3cpWsn" id="6hawlnuCi_J" role="3cpWs9">
+                        <property role="TrG5h" value="executorService" />
+                        <node concept="3uibUv" id="6hawlnuCi_K" role="1tU5fm">
+                          <ref role="3uigEE" to="5zyv:~ExecutorService" resolve="ExecutorService" />
+                        </node>
+                        <node concept="2YIFZM" id="6hawlnuCjei" role="33vP2m">
+                          <ref role="37wK5l" to="5zyv:~Executors.newSingleThreadExecutor()" resolve="newSingleThreadExecutor" />
+                          <ref role="1Pybhc" to="5zyv:~Executors" resolve="Executors" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="6hawlnuCluE" role="3cqZAp" />
+                    <node concept="3clFbF" id="6hawlnuCmsy" role="3cqZAp">
+                      <node concept="2OqwBi" id="6hawlnuCmTo" role="3clFbG">
+                        <node concept="37vLTw" id="6hawlnuCmsw" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6hawlnuCi_J" resolve="executorService" />
+                        </node>
+                        <node concept="liA8E" id="6hawlnuCo1u" role="2OqNvi">
+                          <ref role="37wK5l" to="5zyv:~Executor.execute(java.lang.Runnable)" resolve="execute" />
+                          <node concept="1bVj0M" id="6hawlnuCosq" role="37wK5m">
+                            <node concept="3clFbS" id="6hawlnuCosr" role="1bW5cS">
+                              <node concept="3J1_TO" id="6hawlnuCqp0" role="3cqZAp">
+                                <node concept="3uVAMA" id="6hawlnuCqHA" role="1zxBo5">
+                                  <node concept="XOnhg" id="6hawlnuCqHB" role="1zc67B">
+                                    <property role="TrG5h" value="e" />
+                                    <node concept="nSUau" id="6hawlnuCqHC" role="1tU5fm">
+                                      <node concept="3uibUv" id="6hawlnuCr2f" role="nSUat">
+                                        <ref role="3uigEE" to="wyt6:~AssertionError" resolve="AssertionError" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbS" id="6hawlnuCqHD" role="1zc67A">
+                                    <node concept="3clFbF" id="6hawlnuCt2R" role="3cqZAp">
+                                      <node concept="2OqwBi" id="6hawlnuCttW" role="3clFbG">
+                                        <node concept="37vLTw" id="6hawlnuCt2Q" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="6hawlnuCfpu" resolve="otherThreadFailed" />
+                                        </node>
+                                        <node concept="liA8E" id="6hawlnuCu1G" role="2OqNvi">
+                                          <ref role="37wK5l" to="i5cy:~AtomicBoolean.set(boolean)" resolve="set" />
+                                          <node concept="3clFbT" id="6hawlnuCumD" role="37wK5m">
+                                            <property role="3clFbU" value="true" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="YS8fn" id="6hawlnuCuWe" role="3cqZAp">
+                                      <node concept="37vLTw" id="6hawlnuCvhI" role="YScLw">
+                                        <ref role="3cqZAo" node="6hawlnuCqHB" resolve="e" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbS" id="6hawlnuCqp1" role="1zxBo7">
+                                  <node concept="3vFxKo" id="6hawlnuCXFr" role="3cqZAp">
+                                    <node concept="2YIFZM" id="6hawlnuCYqM" role="3vFALc">
+                                      <ref role="37wK5l" to="n7tw:7LqGxA8GqrF" resolve="shouldUseCache" />
+                                      <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6hawlnuCwEj" role="3cqZAp">
+                      <node concept="2OqwBi" id="6hawlnuCxe9" role="3clFbG">
+                        <node concept="37vLTw" id="6hawlnuCwEh" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6hawlnuCi_J" resolve="executorService" />
+                        </node>
+                        <node concept="liA8E" id="6hawlnuCxIK" role="2OqNvi">
+                          <ref role="37wK5l" to="5zyv:~ExecutorService.shutdown()" resolve="shutdown" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWs8" id="6hawlnuCyyl" role="3cqZAp">
+                      <node concept="3cpWsn" id="6hawlnuCyyo" role="3cpWs9">
+                        <property role="TrG5h" value="terminatedInTime" />
+                        <node concept="10P_77" id="6hawlnuCyyj" role="1tU5fm" />
+                        <node concept="2OqwBi" id="6hawlnuC_$c" role="33vP2m">
+                          <node concept="37vLTw" id="6hawlnuC$oD" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6hawlnuCi_J" resolve="executorService" />
+                          </node>
+                          <node concept="liA8E" id="6hawlnuCAcr" role="2OqNvi">
+                            <ref role="37wK5l" to="5zyv:~ExecutorService.awaitTermination(long,java.util.concurrent.TimeUnit)" resolve="awaitTermination" />
+                            <node concept="3cmrfG" id="6hawlnuCAzg" role="37wK5m">
+                              <property role="3cmrfH" value="1" />
+                            </node>
+                            <node concept="Rm8GO" id="6hawlnuCCkp" role="37wK5m">
+                              <ref role="Rm8GQ" to="5zyv:~TimeUnit.SECONDS" resolve="SECONDS" />
+                              <ref role="1Px2BO" to="5zyv:~TimeUnit" resolve="TimeUnit" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3vwNmj" id="6hawlnuCCG$" role="3cqZAp">
+                      <node concept="37vLTw" id="6hawlnuCDLr" role="3vwVQn">
+                        <ref role="3cqZAo" node="6hawlnuCyyo" resolve="terminatedInTime" />
+                      </node>
+                    </node>
+                    <node concept="3vFxKo" id="6hawlnuCEjx" role="3cqZAp">
+                      <node concept="2OqwBi" id="6hawlnuCFOO" role="3vFALc">
+                        <node concept="37vLTw" id="6hawlnuCFfv" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6hawlnuCfpu" resolve="otherThreadFailed" />
+                        </node>
+                        <node concept="liA8E" id="6hawlnuCGlV" role="2OqNvi">
+                          <ref role="37wK5l" to="i5cy:~AtomicBoolean.get()" resolve="get" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="6hawlnuCDLt" role="3cqZAp" />
                     <node concept="3cpWs8" id="2LNowVOJVaT" role="3cqZAp">
                       <node concept="3cpWsn" id="2LNowVOJVaU" role="3cpWs9">
                         <property role="TrG5h" value="logicalChildren" />
@@ -638,6 +807,12 @@
                 </node>
               </node>
             </node>
+            <node concept="3vFxKo" id="6hawlnuBFVt" role="3cqZAp">
+              <node concept="2YIFZM" id="6hawlnuBGNE" role="3vFALc">
+                <ref role="37wK5l" to="n7tw:7LqGxA8GqrF" resolve="shouldUseCache" />
+                <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+              </node>
+            </node>
             <node concept="3clFbH" id="2LNowVOJWRl" role="3cqZAp" />
             <node concept="3cpWs8" id="2LNowVOK1k8" role="3cqZAp">
               <node concept="3cpWsn" id="2LNowVOK1k9" role="3cpWs9">

From 22b5843e03e3242b4ea444dd517e1f6791cac93c Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 14 Oct 2024 21:16:03 +0200
Subject: [PATCH 14/15] add another test

---
 ...mbeddr.mpsutil.logicalChild.test@tests.mps | 651 +++++++++++++++++-
 .../test.com.mbeddr.mpsutil.logicalChild.msd  |   3 +-
 2 files changed, 647 insertions(+), 7 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
index 1153a0f1872..818ff6730aa 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
@@ -4,19 +4,26 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="286e2375-00e3-4042-b083-84873dd623be" name="com.mbeddr.mpsutil.logicalChild.sandbox" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
   <imports>
     <import index="n7tw" ref="r:e9fcc9c2-114c-4ba2-897c-9e44451eea40(com.mbeddr.mpsutil.logicalChild.behavior)" />
     <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
-    <import index="xxir" ref="r:a615bfc0-ceb2-486e-85b1-8debbfdfdbb6(com.mbeddr.mpsutil.logicalChild.structure)" implicit="true" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
-    <import index="legp" ref="r:e06fc7a9-6c1d-4d1e-abb5-eda20a08c26c(com.mbeddr.mpsutil.logicalChild.sandbox.structure)" implicit="true" />
+    <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
+    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="legp" ref="r:e06fc7a9-6c1d-4d1e-abb5-eda20a08c26c(com.mbeddr.mpsutil.logicalChild.sandbox.structure)" />
+    <import index="xxir" ref="r:a615bfc0-ceb2-486e-85b1-8debbfdfdbb6(com.mbeddr.mpsutil.logicalChild.structure)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -35,11 +42,18 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
       <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="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
         <child id="8118189177080264854" name="alternative" index="nSUat" />
       </concept>
+      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
+        <child id="1239714902950" name="expression" index="2$L3a6" />
+      </concept>
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -61,18 +75,29 @@
       <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
         <child id="1164991057263" name="throwable" index="YScLw" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
+      <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -103,8 +128,12 @@
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
+      <concept id="1068581242867" name="jetbrains.mps.baseLanguage.structure.LongType" flags="in" index="3cpWsb" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
@@ -121,6 +150,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="3093926081414150598" name="jetbrains.mps.baseLanguage.structure.MultipleCatchClause" flags="ng" index="3uVAMA">
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
@@ -138,6 +168,15 @@
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
     </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+      <concept id="8974276187400348179" name="jetbrains.mps.lang.access.structure.ExecuteEDTCommandStatement" flags="nn" index="1QHqEQ" />
+    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -181,6 +220,7 @@
       <concept id="1171983834376" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertFalse" flags="nn" index="3vFxKo">
         <child id="1171983854940" name="condition" index="3vFALc" />
       </concept>
+      <concept id="1172017222794" name="jetbrains.mps.baseLanguage.unitTest.structure.Fail" flags="nn" index="3xETmq" />
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
         <child id="1172073511101" name="message" index="3_1BAH" />
       </concept>
@@ -247,7 +287,20 @@
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
+        <child id="1153944400369" name="variable" index="2Gsz3X" />
+        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
+      </concept>
+      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
+      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
+        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
+      </concept>
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
     </language>
@@ -972,5 +1025,593 @@
   <node concept="2XOHcx" id="4Ijegxhuddk">
     <property role="2XOHcw" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.mpsutil" />
   </node>
+  <node concept="1lH9Xt" id="79TFkryAZn8">
+    <property role="3DII0k" value="2hh8MJdVwqT/none" />
+    <property role="TrG5h" value="ILogicalChildResolvingMultipleThreads" />
+    <node concept="1LZb2c" id="79TFkryAZsg" role="1SL9yI">
+      <property role="TrG5h" value="multipleThreads" />
+      <node concept="3cqZAl" id="79TFkryAZsh" role="3clF45" />
+      <node concept="3clFbS" id="79TFkryAZsi" role="3clF47">
+        <node concept="3cpWs8" id="79TFkryAZsj" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryAZsk" role="3cpWs9">
+            <property role="TrG5h" value="exampleModel" />
+            <node concept="1XwpNF" id="79TFkryAZsl" role="1tU5fm" />
+            <node concept="1Xw6AR" id="79TFkryAZsm" role="33vP2m">
+              <node concept="1dCxOl" id="79TFkryAZsn" role="1XwpL7">
+                <property role="1XweGQ" value="r:ced7d7b2-46d1-452d-9f1f-a15fe0e7ebee" />
+                <node concept="1j_P7g" id="79TFkryAZso" role="1j$8Uc">
+                  <property role="1j_P7h" value="com.mbeddr.mpsutil.logicalChild.sandbox.sandbox.example" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="79TFkryAZsp" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryAZsq" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="79TFkryAZsr" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="79TFkryAZss" role="33vP2m">
+              <node concept="1jxXqW" id="79TFkryAZst" role="2Oq$k0" />
+              <node concept="liA8E" id="79TFkryAZsu" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="79TFkryAZsv" role="3cqZAp" />
+        <node concept="3cpWs8" id="79TFkryAZsw" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryAZsx" role="3cpWs9">
+            <property role="TrG5h" value="modell" />
+            <node concept="H_c77" id="79TFkryAZsy" role="1tU5fm" />
+            <node concept="2OqwBi" id="79TFkryAZsz" role="33vP2m">
+              <node concept="37vLTw" id="79TFkryAZs$" role="2Oq$k0">
+                <ref role="3cqZAo" node="79TFkryAZsk" resolve="exampleModel" />
+              </node>
+              <node concept="2yCiCJ" id="79TFkryAZs_" role="2OqNvi">
+                <node concept="37vLTw" id="79TFkryAZsA" role="Vysub">
+                  <ref role="3cqZAo" node="79TFkryAZsq" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="79TFkryAZsB" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryAZsC" role="3cpWs9">
+            <property role="TrG5h" value="ilcos" />
+            <node concept="2I9FWS" id="79TFkryAZsD" role="1tU5fm">
+              <ref role="2I9WkF" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="79TFkryAZsE" role="3cqZAp" />
+        <node concept="1QHqEK" id="79TFkryAZsF" role="3cqZAp">
+          <node concept="1QHqEC" id="79TFkryAZsG" role="1QHqEI">
+            <node concept="3clFbS" id="79TFkryAZsH" role="1bW5cS">
+              <node concept="3clFbF" id="79TFkryAZsI" role="3cqZAp">
+                <node concept="37vLTI" id="79TFkryAZsJ" role="3clFbG">
+                  <node concept="2OqwBi" id="79TFkryAZsK" role="37vLTx">
+                    <node concept="37vLTw" id="79TFkryAZsL" role="2Oq$k0">
+                      <ref role="3cqZAo" node="79TFkryAZsx" resolve="modell" />
+                    </node>
+                    <node concept="2SmgA7" id="79TFkryAZsM" role="2OqNvi">
+                      <node concept="chp4Y" id="79TFkryAZsN" role="1dBWTz">
+                        <ref role="cht4Q" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="79TFkryAZsO" role="37vLTJ">
+                    <ref role="3cqZAo" node="79TFkryAZsC" resolve="ilcos" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="79TFkryAZsP" role="ukAjM">
+            <ref role="3cqZAo" node="79TFkryAZsq" resolve="repository" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="79TFkryAZsQ" role="3cqZAp" />
+        <node concept="1gVbGN" id="79TFkryAZsR" role="3cqZAp">
+          <node concept="3clFbC" id="79TFkryAZsS" role="1gVkn0">
+            <node concept="3cmrfG" id="79TFkryAZsT" role="3uHU7w">
+              <property role="3cmrfH" value="1" />
+            </node>
+            <node concept="2OqwBi" id="79TFkryAZsU" role="3uHU7B">
+              <node concept="37vLTw" id="79TFkryAZsV" role="2Oq$k0">
+                <ref role="3cqZAo" node="79TFkryAZsC" resolve="ilcos" />
+              </node>
+              <node concept="34oBXx" id="79TFkryAZsW" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="79TFkryAZsX" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryAZsY" role="3cpWs9">
+            <property role="TrG5h" value="ilco" />
+            <node concept="3Tqbb2" id="79TFkryAZsZ" role="1tU5fm">
+              <ref role="ehGHo" to="xxir:jksL7exwyH" resolve="ILogicalChildOwner" />
+            </node>
+            <node concept="2OqwBi" id="79TFkryAZt0" role="33vP2m">
+              <node concept="37vLTw" id="79TFkryAZt1" role="2Oq$k0">
+                <ref role="3cqZAo" node="79TFkryAZsC" resolve="ilcos" />
+              </node>
+              <node concept="34jXtK" id="79TFkryAZt2" role="2OqNvi">
+                <node concept="3cmrfG" id="79TFkryAZt3" role="25WWJ7">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="79TFkryAZt4" role="3cqZAp" />
+        <node concept="3cpWs8" id="79TFkryAZt5" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryAZt6" role="3cpWs9">
+            <property role="TrG5h" value="threadNumber" />
+            <node concept="10Oyi0" id="79TFkryAZt7" role="1tU5fm" />
+            <node concept="3cmrfG" id="79TFkryAZt8" role="33vP2m">
+              <property role="3cmrfH" value="100" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="79TFkryAZt9" role="3cqZAp" />
+        <node concept="3cpWs8" id="79TFkryAZta" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryAZtb" role="3cpWs9">
+            <property role="TrG5h" value="results" />
+            <property role="3TUv4t" value="true" />
+            <node concept="_YKpA" id="79TFkryAZtc" role="1tU5fm">
+              <node concept="10Oyi0" id="79TFkryAZtd" role="_ZDj9" />
+            </node>
+            <node concept="2ShNRf" id="79TFkryAZte" role="33vP2m">
+              <node concept="Tc6Ow" id="79TFkryAZtf" role="2ShVmc">
+                <node concept="10Oyi0" id="79TFkryAZtg" role="HW$YZ" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="79TFkryAZth" role="3cqZAp" />
+        <node concept="3cpWs8" id="79TFkryAZti" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryAZtj" role="3cpWs9">
+            <property role="TrG5h" value="latch" />
+            <node concept="3uibUv" id="79TFkryAZtk" role="1tU5fm">
+              <ref role="3uigEE" to="5zyv:~CountDownLatch" resolve="CountDownLatch" />
+            </node>
+            <node concept="2ShNRf" id="79TFkryAZtl" role="33vP2m">
+              <node concept="1pGfFk" id="79TFkryAZtm" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="5zyv:~CountDownLatch.&lt;init&gt;(int)" resolve="CountDownLatch" />
+                <node concept="37vLTw" id="79TFkryAZtn" role="37wK5m">
+                  <ref role="3cqZAo" node="79TFkryAZt6" resolve="threadNumber" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="79TFkryHsHZ" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryHsI2" role="3cpWs9">
+            <property role="TrG5h" value="threadIndex" />
+            <node concept="10Oyi0" id="79TFkryHsHX" role="1tU5fm" />
+            <node concept="3cmrfG" id="79TFkryHtRv" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="79TFkryHtRK" role="3cqZAp" />
+        <node concept="3cpWs8" id="79TFkryAZtp" role="3cqZAp">
+          <node concept="3cpWsn" id="79TFkryAZtq" role="3cpWs9">
+            <property role="TrG5h" value="workers" />
+            <node concept="_YKpA" id="79TFkryAZtr" role="1tU5fm">
+              <node concept="3uibUv" id="79TFkryAZts" role="_ZDj9">
+                <ref role="3uigEE" to="wyt6:~Thread" resolve="Thread" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="79TFkryAZtt" role="33vP2m">
+              <node concept="2OqwBi" id="79TFkryAZtu" role="2Oq$k0">
+                <node concept="2YIFZM" id="79TFkryAZtv" role="2Oq$k0">
+                  <ref role="37wK5l" to="1ctc:~Stream.generate(java.util.function.Supplier)" resolve="generate" />
+                  <ref role="1Pybhc" to="1ctc:~Stream" resolve="Stream" />
+                  <node concept="1bVj0M" id="79TFkryAZtw" role="37wK5m">
+                    <node concept="3clFbS" id="79TFkryAZtx" role="1bW5cS">
+                      <node concept="3clFbF" id="79TFkryAZty" role="3cqZAp">
+                        <node concept="2ShNRf" id="79TFkryAZtz" role="3clFbG">
+                          <node concept="1pGfFk" id="79TFkryAZt$" role="2ShVmc">
+                            <property role="373rjd" value="true" />
+                            <ref role="37wK5l" to="wyt6:~Thread.&lt;init&gt;(java.lang.Runnable,java.lang.String)" resolve="Thread" />
+                            <node concept="1bVj0M" id="79TFkryAZt_" role="37wK5m">
+                              <node concept="3clFbS" id="79TFkryAZtA" role="1bW5cS">
+                                <node concept="3cpWs8" id="79TFkryHbbM" role="3cqZAp">
+                                  <node concept="3cpWsn" id="79TFkryHbbP" role="3cpWs9">
+                                    <property role="TrG5h" value="threadName" />
+                                    <node concept="17QB3L" id="79TFkryHbbK" role="1tU5fm" />
+                                    <node concept="2OqwBi" id="79TFkryGBZG" role="33vP2m">
+                                      <node concept="2YIFZM" id="79TFkryGBk1" role="2Oq$k0">
+                                        <ref role="37wK5l" to="wyt6:~Thread.currentThread()" resolve="currentThread" />
+                                        <ref role="1Pybhc" to="wyt6:~Thread" resolve="Thread" />
+                                      </node>
+                                      <node concept="liA8E" id="79TFkryGCGh" role="2OqNvi">
+                                        <ref role="37wK5l" to="wyt6:~Thread.getName()" resolve="getName" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3J1_TO" id="79TFkryJc5A" role="3cqZAp">
+                                  <node concept="3uVAMA" id="79TFkryJcXl" role="1zxBo5">
+                                    <node concept="XOnhg" id="79TFkryJcXm" role="1zc67B">
+                                      <property role="TrG5h" value="e" />
+                                      <node concept="nSUau" id="79TFkryJcXn" role="1tU5fm">
+                                        <node concept="3uibUv" id="79TFkryJdN6" role="nSUat">
+                                          <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbS" id="79TFkryJcXo" role="1zc67A" />
+                                  </node>
+                                  <node concept="3clFbS" id="79TFkryJc5C" role="1zxBo7">
+                                    <node concept="3clFbF" id="79TFkryIS3R" role="3cqZAp">
+                                      <node concept="2YIFZM" id="79TFkryISVt" role="3clFbG">
+                                        <ref role="37wK5l" to="wyt6:~Thread.sleep(long)" resolve="sleep" />
+                                        <ref role="1Pybhc" to="wyt6:~Thread" resolve="Thread" />
+                                        <node concept="10QFUN" id="79TFkryJ15C" role="37wK5m">
+                                          <node concept="3cpWsb" id="79TFkryJ15D" role="10QFUM" />
+                                          <node concept="1eOMI4" id="79TFkryJ15E" role="10QFUP">
+                                            <node concept="17qRlL" id="79TFkryIVM3" role="1eOMHV">
+                                              <node concept="3cmrfG" id="79TFkryIVM6" role="3uHU7w">
+                                                <property role="3cmrfH" value="200" />
+                                              </node>
+                                              <node concept="2YIFZM" id="79TFkryIUoT" role="3uHU7B">
+                                                <ref role="37wK5l" to="wyt6:~Math.random()" resolve="random" />
+                                                <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="79TFkryGxq7" role="3cqZAp">
+                                  <node concept="2OqwBi" id="79TFkryGxq4" role="3clFbG">
+                                    <node concept="10M0yZ" id="79TFkryGxq5" role="2Oq$k0">
+                                      <ref role="1PxDUh" to="wyt6:~System" />
+                                      <ref role="3cqZAo" to="wyt6:~System.out" />
+                                    </node>
+                                    <node concept="liA8E" id="79TFkryGxq6" role="2OqNvi">
+                                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                                      <node concept="3cpWs3" id="79TFkryG$kP" role="37wK5m">
+                                        <node concept="Xl_RD" id="79TFkryGxXv" role="3uHU7B">
+                                          <property role="Xl_RC" value="Start:" />
+                                        </node>
+                                        <node concept="37vLTw" id="79TFkryHfsJ" role="3uHU7w">
+                                          <ref role="3cqZAo" node="79TFkryHbbP" resolve="threadName" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="1QHqEQ" id="79TFkryAZtT" role="3cqZAp">
+                                  <node concept="1QHqEC" id="79TFkryAZtU" role="1QHqEI">
+                                    <node concept="3clFbS" id="79TFkryAZtV" role="1bW5cS">
+                                      <node concept="3J1_TO" id="79TFkryAZtB" role="3cqZAp">
+                                        <node concept="3uVAMA" id="79TFkryAZtC" role="1zxBo5">
+                                          <node concept="XOnhg" id="79TFkryAZtD" role="1zc67B">
+                                            <property role="TrG5h" value="e" />
+                                            <node concept="nSUau" id="79TFkryAZtE" role="1tU5fm">
+                                              <node concept="3uibUv" id="79TFkryAZtF" role="nSUat">
+                                                <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3clFbS" id="79TFkryAZtG" role="1zc67A">
+                                            <node concept="3clFbF" id="79TFkryAZtH" role="3cqZAp">
+                                              <node concept="2OqwBi" id="79TFkryAZtI" role="3clFbG">
+                                                <node concept="10M0yZ" id="79TFkryAZtJ" role="2Oq$k0">
+                                                  <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                                                  <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+                                                </node>
+                                                <node concept="liA8E" id="79TFkryAZtK" role="2OqNvi">
+                                                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                                                  <node concept="2OqwBi" id="79TFkryAZtL" role="37wK5m">
+                                                    <node concept="37vLTw" id="79TFkryAZtM" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="79TFkryAZtD" resolve="e" />
+                                                    </node>
+                                                    <node concept="liA8E" id="79TFkryAZtN" role="2OqNvi">
+                                                      <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="3clFbS" id="79TFkryAZtO" role="1zxBo7">
+                                          <node concept="3clFbF" id="79TFkryChj3" role="3cqZAp">
+                                            <node concept="2YIFZM" id="79TFkryChj4" role="3clFbG">
+                                              <ref role="37wK5l" to="n7tw:4dKV7gVaIME" resolve="withCachedLogicalChildren" />
+                                              <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+                                              <node concept="1bVj0M" id="79TFkryChj5" role="37wK5m">
+                                                <node concept="3clFbS" id="79TFkryChj6" role="1bW5cS">
+                                                  <node concept="3vwNmj" id="79TFkryD3g1" role="3cqZAp">
+                                                    <node concept="2YIFZM" id="79TFkryD1Ew" role="3vwVQn">
+                                                      <ref role="37wK5l" to="n7tw:7LqGxA8GqrF" resolve="shouldUseCache" />
+                                                      <ref role="1Pybhc" to="n7tw:44INz$MLbE3" resolve="LogicalChildOwnerUtil" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3clFbF" id="79TFkryGHGZ" role="3cqZAp">
+                                                    <node concept="2OqwBi" id="79TFkryGHH0" role="3clFbG">
+                                                      <node concept="10M0yZ" id="79TFkryGHH1" role="2Oq$k0">
+                                                        <ref role="1PxDUh" to="wyt6:~System" />
+                                                        <ref role="3cqZAo" to="wyt6:~System.out" />
+                                                      </node>
+                                                      <node concept="liA8E" id="79TFkryGHH2" role="2OqNvi">
+                                                        <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                                                        <node concept="3cpWs3" id="79TFkryGHH3" role="37wK5m">
+                                                          <node concept="Xl_RD" id="79TFkryGHH7" role="3uHU7B">
+                                                            <property role="Xl_RC" value="Inside:" />
+                                                          </node>
+                                                          <node concept="37vLTw" id="79TFkryHh5D" role="3uHU7w">
+                                                            <ref role="3cqZAo" node="79TFkryHbbP" resolve="threadName" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3clFbH" id="79TFkryGHma" role="3cqZAp" />
+                                                  <node concept="3cpWs8" id="79TFkryAZtP" role="3cqZAp">
+                                                    <node concept="3cpWsn" id="79TFkryAZtQ" role="3cpWs9">
+                                                      <property role="TrG5h" value="logicalChildren" />
+                                                      <node concept="_YKpA" id="79TFkryAZtR" role="1tU5fm">
+                                                        <node concept="3Tqbb2" id="79TFkryAZtS" role="_ZDj9">
+                                                          <ref role="ehGHo" to="xxir:jksL7exuXl" resolve="ILogicalChild" />
+                                                        </node>
+                                                      </node>
+                                                      <node concept="2OqwBi" id="79TFkryAZtY" role="33vP2m">
+                                                        <node concept="2OqwBi" id="79TFkryAZtZ" role="2Oq$k0">
+                                                          <node concept="37vLTw" id="79TFkryAZu0" role="2Oq$k0">
+                                                            <ref role="3cqZAo" node="79TFkryAZsY" resolve="ilco" />
+                                                          </node>
+                                                          <node concept="2qgKlT" id="79TFkryAZu1" role="2OqNvi">
+                                                            <ref role="37wK5l" to="n7tw:7c93VeVMIYV" resolve="findLogicalChildren" />
+                                                          </node>
+                                                        </node>
+                                                        <node concept="ANE8D" id="79TFkryAZu2" role="2OqNvi" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3clFbF" id="79TFkryAZu4" role="3cqZAp">
+                                                    <node concept="2OqwBi" id="79TFkryAZu5" role="3clFbG">
+                                                      <node concept="37vLTw" id="79TFkryAZu6" role="2Oq$k0">
+                                                        <ref role="3cqZAo" node="79TFkryAZtb" resolve="results" />
+                                                      </node>
+                                                      <node concept="TSZUe" id="79TFkryAZu7" role="2OqNvi">
+                                                        <node concept="2OqwBi" id="79TFkryAZu8" role="25WWJ7">
+                                                          <node concept="37vLTw" id="79TFkryAZu9" role="2Oq$k0">
+                                                            <ref role="3cqZAo" node="79TFkryAZtQ" resolve="logicalChildren" />
+                                                          </node>
+                                                          <node concept="34oBXx" id="79TFkryAZua" role="2OqNvi" />
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3cpWs8" id="79TFkryDyYn" role="3cqZAp">
+                                                    <node concept="3cpWsn" id="79TFkryDyYq" role="3cpWs9">
+                                                      <property role="TrG5h" value="sum" />
+                                                      <node concept="10Oyi0" id="79TFkryDyYl" role="1tU5fm" />
+                                                      <node concept="3cmrfG" id="79TFkryDzv3" role="33vP2m">
+                                                        <property role="3cmrfH" value="0" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="2Gpval" id="79TFkryDu8x" role="3cqZAp">
+                                                    <node concept="2GrKxI" id="79TFkryDu8z" role="2Gsz3X">
+                                                      <property role="TrG5h" value="result" />
+                                                    </node>
+                                                    <node concept="37vLTw" id="79TFkryDynl" role="2GsD0m">
+                                                      <ref role="3cqZAo" node="79TFkryAZtb" resolve="results" />
+                                                    </node>
+                                                    <node concept="3clFbS" id="79TFkryDu8B" role="2LFqv$">
+                                                      <node concept="3clFbF" id="79TFkryDEbB" role="3cqZAp">
+                                                        <node concept="d57v9" id="79TFkryDFly" role="3clFbG">
+                                                          <node concept="2GrUjf" id="79TFkryDGZb" role="37vLTx">
+                                                            <ref role="2Gs0qQ" node="79TFkryDu8z" resolve="result" />
+                                                          </node>
+                                                          <node concept="37vLTw" id="79TFkryDEb_" role="37vLTJ">
+                                                            <ref role="3cqZAo" node="79TFkryDyYq" resolve="sum" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3clFbF" id="79TFkryAZub" role="3cqZAp">
+                                                    <node concept="2OqwBi" id="79TFkryAZuc" role="3clFbG">
+                                                      <node concept="37vLTw" id="79TFkryAZud" role="2Oq$k0">
+                                                        <ref role="3cqZAo" node="79TFkryAZtj" resolve="latch" />
+                                                      </node>
+                                                      <node concept="liA8E" id="79TFkryAZue" role="2OqNvi">
+                                                        <ref role="37wK5l" to="5zyv:~CountDownLatch.countDown()" resolve="countDown" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3clFbF" id="79TFkryCr1d" role="3cqZAp">
+                                                    <node concept="10Nm6u" id="79TFkryCr1b" role="3clFbG" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="3uibUv" id="79TFkryChlO" role="3PaCim">
+                                                <ref role="3uigEE" to="wyt6:~Void" resolve="Void" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3clFbF" id="79TFkryGEt$" role="3cqZAp">
+                                            <node concept="2OqwBi" id="79TFkryGEt_" role="3clFbG">
+                                              <node concept="10M0yZ" id="79TFkryGEtA" role="2Oq$k0">
+                                                <ref role="1PxDUh" to="wyt6:~System" />
+                                                <ref role="3cqZAo" to="wyt6:~System.out" />
+                                              </node>
+                                              <node concept="liA8E" id="79TFkryGEtB" role="2OqNvi">
+                                                <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                                                <node concept="3cpWs3" id="79TFkryGEtC" role="37wK5m">
+                                                  <node concept="Xl_RD" id="79TFkryGEtG" role="3uHU7B">
+                                                    <property role="Xl_RC" value="End:" />
+                                                  </node>
+                                                  <node concept="37vLTw" id="79TFkryHiIg" role="3uHU7w">
+                                                    <ref role="3cqZAo" node="79TFkryHbbP" resolve="threadName" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="37vLTw" id="79TFkryAZuf" role="ukAjM">
+                                    <ref role="3cqZAo" node="79TFkryAZsq" resolve="repository" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWs3" id="79TFkryGTpq" role="37wK5m">
+                              <node concept="Xl_RD" id="79TFkryGS7$" role="3uHU7B">
+                                <property role="Xl_RC" value="Thread _" />
+                              </node>
+                              <node concept="1eOMI4" id="79TFkryHDlT" role="3uHU7w">
+                                <node concept="3uNrnE" id="79TFkryHCvO" role="1eOMHV">
+                                  <node concept="37vLTw" id="79TFkryHCvQ" role="2$L3a6">
+                                    <ref role="3cqZAo" node="79TFkryHsI2" resolve="threadIndex" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="79TFkryAZug" role="2OqNvi">
+                  <ref role="37wK5l" to="1ctc:~Stream.limit(long)" resolve="limit" />
+                  <node concept="37vLTw" id="79TFkryAZuh" role="37wK5m">
+                    <ref role="3cqZAo" node="79TFkryAZt6" resolve="threadNumber" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="79TFkryAZui" role="2OqNvi">
+                <ref role="37wK5l" to="1ctc:~Stream.collect(java.util.stream.Collector)" resolve="collect" />
+                <node concept="2YIFZM" id="79TFkryAZuj" role="37wK5m">
+                  <ref role="37wK5l" to="1ctc:~Collectors.toList()" resolve="toList" />
+                  <ref role="1Pybhc" to="1ctc:~Collectors" resolve="Collectors" />
+                  <node concept="3uibUv" id="79TFkryAZuk" role="3PaCim">
+                    <ref role="3uigEE" to="wyt6:~Thread" resolve="Thread" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="79TFkryAZul" role="3cqZAp">
+          <node concept="2OqwBi" id="79TFkryAZum" role="3clFbG">
+            <node concept="37vLTw" id="79TFkryAZun" role="2Oq$k0">
+              <ref role="3cqZAo" node="79TFkryAZtq" resolve="workers" />
+            </node>
+            <node concept="2es0OD" id="79TFkryAZuo" role="2OqNvi">
+              <node concept="1bVj0M" id="79TFkryAZup" role="23t8la">
+                <node concept="3clFbS" id="79TFkryAZuq" role="1bW5cS">
+                  <node concept="3clFbF" id="79TFkryAZur" role="3cqZAp">
+                    <node concept="2OqwBi" id="79TFkryAZus" role="3clFbG">
+                      <node concept="37vLTw" id="79TFkryAZut" role="2Oq$k0">
+                        <ref role="3cqZAo" node="79TFkryAZuv" resolve="it" />
+                      </node>
+                      <node concept="liA8E" id="79TFkryAZuu" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Thread.start()" resolve="start" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="79TFkryAZuv" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="79TFkryAZuw" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3J1_TO" id="79TFkryAZux" role="3cqZAp">
+          <node concept="3clFbS" id="79TFkryAZuy" role="1zxBo7">
+            <node concept="3vwNmj" id="79TFkryAZuz" role="3cqZAp">
+              <node concept="2OqwBi" id="79TFkryAZu$" role="3vwVQn">
+                <node concept="37vLTw" id="79TFkryAZu_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="79TFkryAZtj" resolve="latch" />
+                </node>
+                <node concept="liA8E" id="79TFkryAZuA" role="2OqNvi">
+                  <ref role="37wK5l" to="5zyv:~CountDownLatch.await(long,java.util.concurrent.TimeUnit)" resolve="await" />
+                  <node concept="3cmrfG" id="79TFkryAZuB" role="37wK5m">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                  <node concept="Rm8GO" id="79TFkryAZuC" role="37wK5m">
+                    <ref role="Rm8GQ" to="5zyv:~TimeUnit.SECONDS" resolve="SECONDS" />
+                    <ref role="1Px2BO" to="5zyv:~TimeUnit" resolve="TimeUnit" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3uVAMA" id="79TFkryAZuD" role="1zxBo5">
+            <node concept="3clFbS" id="79TFkryAZuE" role="1zc67A">
+              <node concept="3xETmq" id="79TFkryAZuF" role="3cqZAp">
+                <node concept="3_1$Yv" id="79TFkryAZuG" role="3_9lra">
+                  <node concept="2OqwBi" id="79TFkryAZuH" role="3_1BAH">
+                    <node concept="37vLTw" id="79TFkryAZuI" role="2Oq$k0">
+                      <ref role="3cqZAo" node="79TFkryAZuK" resolve="e" />
+                    </node>
+                    <node concept="liA8E" id="79TFkryAZuJ" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="XOnhg" id="79TFkryAZuK" role="1zc67B">
+              <property role="TrG5h" value="e" />
+              <node concept="nSUau" id="79TFkryAZuL" role="1tU5fm">
+                <node concept="3uibUv" id="79TFkryAZuM" role="nSUat">
+                  <ref role="3uigEE" to="wyt6:~InterruptedException" resolve="InterruptedException" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="79TFkryAZuN" role="3cqZAp">
+          <node concept="37vLTw" id="79TFkryAZuO" role="3tpDZB">
+            <ref role="3cqZAo" node="79TFkryAZt6" resolve="threadNumber" />
+          </node>
+          <node concept="2OqwBi" id="79TFkryAZuP" role="3tpDZA">
+            <node concept="37vLTw" id="79TFkryAZuQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="79TFkryAZtb" resolve="results" />
+            </node>
+            <node concept="34oBXx" id="79TFkryAZuR" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="79TFkryC4$V" role="3cqZAp" />
+        <node concept="2Gpval" id="79TFkryC5gm" role="3cqZAp">
+          <node concept="2GrKxI" id="79TFkryC5go" role="2Gsz3X">
+            <property role="TrG5h" value="number" />
+          </node>
+          <node concept="37vLTw" id="79TFkryC8M1" role="2GsD0m">
+            <ref role="3cqZAo" node="79TFkryAZtb" resolve="results" />
+          </node>
+          <node concept="3clFbS" id="79TFkryC5gs" role="2LFqv$">
+            <node concept="3vlDli" id="79TFkryC9eX" role="3cqZAp">
+              <node concept="3cmrfG" id="79TFkryC9Ev" role="3tpDZB">
+                <property role="3cmrfH" value="2" />
+              </node>
+              <node concept="2GrUjf" id="79TFkryCa62" role="3tpDZA">
+                <ref role="2Gs0qQ" node="79TFkryC5go" resolve="number" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd
index 17113629f5b..ddc76a336e4 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd
@@ -17,13 +17,12 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:85a9bace-37a1-40af-956a-7bb1b081a77c:com.mbeddr.mpsutil.logicalChild" version="0" />
-    <language slang="l:286e2375-00e3-4042-b083-84873dd623be:com.mbeddr.mpsutil.logicalChild.sandbox" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />

From dc4c7f065efed863ca2013e66f77d6f32ba8fb04 Mon Sep 17 00:00:00 2001
From: dbinkele <dbinkele@itemis.de>
Date: Wed, 16 Oct 2024 12:40:35 +0200
Subject: [PATCH 15/15] run 'gradle migrate remigrate'(#2547)

---
 ...st.com.mbeddr.mpsutil.logicalChild.test@tests.mps | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
index 818ff6730aa..94510e7afe6 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/models/test.com.mbeddr.mpsutil.logicalChild.test@tests.mps
@@ -1272,8 +1272,8 @@
                                 <node concept="3clFbF" id="79TFkryGxq7" role="3cqZAp">
                                   <node concept="2OqwBi" id="79TFkryGxq4" role="3clFbG">
                                     <node concept="10M0yZ" id="79TFkryGxq5" role="2Oq$k0">
-                                      <ref role="1PxDUh" to="wyt6:~System" />
-                                      <ref role="3cqZAo" to="wyt6:~System.out" />
+                                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                                      <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
                                     </node>
                                     <node concept="liA8E" id="79TFkryGxq6" role="2OqNvi">
                                       <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
@@ -1339,8 +1339,8 @@
                                                   <node concept="3clFbF" id="79TFkryGHGZ" role="3cqZAp">
                                                     <node concept="2OqwBi" id="79TFkryGHH0" role="3clFbG">
                                                       <node concept="10M0yZ" id="79TFkryGHH1" role="2Oq$k0">
-                                                        <ref role="1PxDUh" to="wyt6:~System" />
-                                                        <ref role="3cqZAo" to="wyt6:~System.out" />
+                                                        <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                                                        <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
                                                       </node>
                                                       <node concept="liA8E" id="79TFkryGHH2" role="2OqNvi">
                                                         <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
@@ -1444,8 +1444,8 @@
                                           <node concept="3clFbF" id="79TFkryGEt$" role="3cqZAp">
                                             <node concept="2OqwBi" id="79TFkryGEt_" role="3clFbG">
                                               <node concept="10M0yZ" id="79TFkryGEtA" role="2Oq$k0">
-                                                <ref role="1PxDUh" to="wyt6:~System" />
-                                                <ref role="3cqZAo" to="wyt6:~System.out" />
+                                                <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                                                <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
                                               </node>
                                               <node concept="liA8E" id="79TFkryGEtB" role="2OqNvi">
                                                 <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />