diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
index c9a9622e..24ff8bc8 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
@@ -26,6 +26,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" 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" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index acb58451..7ae151d3 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -11,6 +11,7 @@
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
+    <use id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences" version="0" />
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
@@ -33,6 +34,7 @@
     <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -82,6 +84,7 @@
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <property id="2523873803623706117" name="isMultiline" index="hSjvv" />
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
@@ -348,6 +351,16 @@
       </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
+    <language id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences">
+      <concept id="7915009415671748557" name="jetbrains.mps.baseLanguage.methodReferences.structure.MethodReferenceTypeTargetExpression" flags="ng" index="2FaPjH">
+        <child id="7915009415671751864" name="type" index="2FaQuo" />
+      </concept>
+      <concept id="237887375562511215" name="jetbrains.mps.baseLanguage.methodReferences.structure.MethodReference" flags="ng" index="37Ijox" />
+      <concept id="3507059745126391419" name="jetbrains.mps.baseLanguage.methodReferences.structure.IMethodReference" flags="ngI" index="3UZKCU">
+        <reference id="237887375562511297" name="method" index="37Ijqf" />
+        <child id="962278442658307079" name="target" index="wWaWy" />
+      </concept>
+    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
         <property id="2034914114981261751" name="severity" index="RRSoG" />
@@ -6197,38 +6210,35 @@
       </node>
     </node>
     <node concept="2tJIrI" id="55xYlrlTL9J" role="jymVt" />
-    <node concept="3clFb_" id="55xYlrlTKvX" role="jymVt">
+    <node concept="3clFb_" id="4nDRG5B2lRG" role="jymVt">
       <property role="TrG5h" value="handleFeedback" />
-      <node concept="3Tm1VV" id="55xYlrlTKvZ" role="1B3o_S" />
-      <node concept="10P_77" id="55xYlrlTKw1" role="3clF45" />
-      <node concept="37vLTG" id="55xYlrlTKw2" role="3clF46">
-        <property role="TrG5h" value="ruleMatch" />
-        <node concept="3uibUv" id="55xYlrlTKw3" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
-        </node>
+      <node concept="3Tm1VV" id="4nDRG5B2lRI" role="1B3o_S" />
+      <node concept="3uibUv" id="4nDRG5B2lRK" role="3clF45">
+        <ref role="3uigEE" to="w7la:~Supervisor$HandleResult" resolve="Supervisor.HandleResult" />
       </node>
-      <node concept="37vLTG" id="55xYlrlTKw4" role="3clF46">
-        <property role="TrG5h" value="feedbackKey" />
-        <node concept="3uibUv" id="55xYlrlTKw5" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="55xYlrlTKw6" role="3clF46">
-        <property role="TrG5h" value="feedbackBasis" />
-        <node concept="3uibUv" id="55xYlrlTKw7" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="55xYlrlTKw8" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="55xYlrlTKw9" role="3clF46">
+      <node concept="37vLTG" id="4nDRG5B2lRL" role="3clF46">
         <property role="TrG5h" value="feedback" />
-        <node concept="3uibUv" id="55xYlrlTKwa" role="1tU5fm">
+        <node concept="3uibUv" id="4nDRG5B2lRM" role="1tU5fm">
           <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
         </node>
       </node>
-      <node concept="3clFbS" id="55xYlrlTKwd" role="3clF47">
+      <node concept="37vLTG" id="4nDRG5B2lRN" role="3clF46">
+        <property role="TrG5h" value="ruleMatch" />
+        <node concept="3uibUv" id="4nDRG5B2lRO" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4nDRG5B2lRP" role="3clF46">
+        <property role="TrG5h" value="provenance" />
+        <node concept="3uibUv" id="4nDRG5B2lRQ" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="4nDRG5B2lRR" role="11_B2D">
+            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="4nDRG5B2lRU" role="3clF47">
+        <node concept="3clFbH" id="4nDRG5BBUXt" role="3cqZAp" />
         <node concept="3clFbJ" id="1laj_RSiIHM" role="3cqZAp">
           <node concept="3clFbS" id="1laj_RSiIHO" role="3clFbx">
             <node concept="3cpWs8" id="1laj_RSiJwR" role="3cqZAp">
@@ -6244,7 +6254,7 @@
                     </node>
                     <node concept="2OqwBi" id="1laj_RSiJy7" role="10QFUP">
                       <node concept="37vLTw" id="55xYlrlTM9p" role="2Oq$k0">
-                        <ref role="3cqZAo" node="55xYlrlTKw2" resolve="ruleMatch" />
+                        <ref role="3cqZAo" node="4nDRG5B2lRN" resolve="ruleMatch" />
                       </node>
                       <node concept="liA8E" id="1laj_RSiJy9" role="2OqNvi">
                         <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
@@ -6254,6 +6264,19 @@
                 </node>
               </node>
             </node>
+            <node concept="3cpWs8" id="4nDRG5B00$H" role="3cqZAp">
+              <node concept="3cpWsn" id="4nDRG5B00$I" role="3cpWs9">
+                <property role="TrG5h" value="ruleMatchId" />
+                <node concept="10Oyi0" id="4nDRG5B00uv" role="1tU5fm" />
+                <node concept="2YIFZM" id="4nDRG5B00$J" role="33vP2m">
+                  <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
+                  <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                  <node concept="37vLTw" id="4nDRG5B00$K" role="37wK5m">
+                    <ref role="3cqZAo" node="4nDRG5B2lRN" resolve="ruleMatch" />
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbH" id="1laj_RSiRVQ" role="3cqZAp" />
             <node concept="3cpWs8" id="1laj_RTMHGM" role="3cqZAp">
               <node concept="3cpWsn" id="1laj_RTMHGN" role="3cpWs9">
@@ -6282,7 +6305,7 @@
                           </node>
                           <node concept="2OqwBi" id="1laj_RTMMUY" role="10QFUP">
                             <node concept="37vLTw" id="55xYlrlTMwf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="55xYlrlTKw9" resolve="feedback" />
+                              <ref role="3cqZAo" node="4nDRG5B2lRL" resolve="feedback" />
                             </node>
                             <node concept="liA8E" id="1laj_RTMMV0" role="2OqNvi">
                               <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
@@ -6309,7 +6332,7 @@
                           </node>
                           <node concept="2OqwBi" id="4ekZiHde4OG" role="10QFUP">
                             <node concept="37vLTw" id="55xYlrlTMFC" role="2Oq$k0">
-                              <ref role="3cqZAo" node="55xYlrlTKw9" resolve="feedback" />
+                              <ref role="3cqZAo" node="4nDRG5B2lRL" resolve="feedback" />
                             </node>
                             <node concept="liA8E" id="4ekZiHde4OI" role="2OqNvi">
                               <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
@@ -6333,7 +6356,7 @@
                 </node>
                 <node concept="2OqwBi" id="1laj_RTMMt7" role="2ZW6bz">
                   <node concept="37vLTw" id="55xYlrlTMkQ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="55xYlrlTKw9" resolve="feedback" />
+                    <ref role="3cqZAo" node="4nDRG5B2lRL" resolve="feedback" />
                   </node>
                   <node concept="liA8E" id="1laj_RTMM_M" role="2OqNvi">
                     <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
@@ -6385,7 +6408,73 @@
             <node concept="3clFbH" id="1laj_RTMOO6" role="3cqZAp" />
             <node concept="3clFbJ" id="4jcOV4hNvEG" role="3cqZAp">
               <node concept="3clFbS" id="4jcOV4hNvEH" role="3clFbx">
-                <node concept="3clFbH" id="5rVYEA66yoJ" role="3cqZAp" />
+                <node concept="3cpWs8" id="4nDRG5CBGAs" role="3cqZAp">
+                  <node concept="3cpWsn" id="4nDRG5CBGAt" role="3cpWs9">
+                    <property role="TrG5h" value="tags" />
+                    <node concept="3uibUv" id="4nDRG5CBGdA" role="1tU5fm">
+                      <ref role="3uigEE" to="33ny:~List" resolve="List" />
+                      <node concept="3uibUv" id="4nDRG5CBGdD" role="11_B2D">
+                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="4nDRG5CBGAu" role="33vP2m">
+                      <property role="hSjvv" value="true" />
+                      <node concept="2OqwBi" id="4nDRG5CBGAv" role="2Oq$k0">
+                        <property role="hSjvv" value="true" />
+                        <node concept="2OqwBi" id="4nDRG5CBGAw" role="2Oq$k0">
+                          <property role="hSjvv" value="true" />
+                          <node concept="2OqwBi" id="4nDRG5CBGAx" role="2Oq$k0">
+                            <property role="hSjvv" value="true" />
+                            <node concept="2OqwBi" id="4nDRG5CBGAy" role="2Oq$k0">
+                              <node concept="37vLTw" id="4nDRG5CBGAz" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4nDRG5B2lRP" resolve="provenance" />
+                              </node>
+                              <node concept="liA8E" id="4nDRG5CBGA$" role="2OqNvi">
+                                <ref role="37wK5l" to="33ny:~Collection.stream()" resolve="stream" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="4nDRG5CBGA_" role="2OqNvi">
+                              <ref role="37wK5l" to="1ctc:~Stream.filter(java.util.function.Predicate)" resolve="filter" />
+                              <node concept="37Ijox" id="4nDRG5CBGAA" role="37wK5m">
+                                <ref role="37Ijqf" to="wyt6:~Class.isInstance(java.lang.Object)" resolve="isInstance" />
+                                <node concept="3VsKOn" id="4nDRG5CBGAB" role="wWaWy">
+                                  <ref role="3VsUkX" to="av0y:~Rule" resolve="Rule" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="4nDRG5CBGAC" role="2OqNvi">
+                            <ref role="37wK5l" to="1ctc:~Stream.map(java.util.function.Function)" resolve="map" />
+                            <node concept="37Ijox" id="4nDRG5CBGAD" role="37wK5m">
+                              <ref role="37Ijqf" to="wyt6:~Class.cast(java.lang.Object)" resolve="cast" />
+                              <node concept="3VsKOn" id="4nDRG5CBGAE" role="wWaWy">
+                                <ref role="3VsUkX" to="av0y:~Rule" resolve="Rule" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="4nDRG5CBGAF" role="2OqNvi">
+                          <ref role="37wK5l" to="1ctc:~Stream.map(java.util.function.Function)" resolve="map" />
+                          <node concept="37Ijox" id="4nDRG5CBGAG" role="37wK5m">
+                            <ref role="37Ijqf" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
+                            <node concept="2FaPjH" id="4nDRG5CBGAH" role="wWaWy">
+                              <node concept="3uibUv" id="4nDRG5CBGAI" role="2FaQuo">
+                                <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="4nDRG5CBGAJ" role="2OqNvi">
+                        <ref role="37wK5l" to="1ctc:~Stream.collect(java.util.stream.Collector)" resolve="collect" />
+                        <node concept="2YIFZM" id="4nDRG5CBGAK" role="37wK5m">
+                          <ref role="37wK5l" to="1ctc:~Collectors.toList()" resolve="toList" />
+                          <ref role="1Pybhc" to="1ctc:~Collectors" resolve="Collectors" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3clFbF" id="6RN9TdHnrzY" role="3cqZAp">
                   <node concept="2OqwBi" id="6RN9TdHnrTu" role="3clFbG">
                     <node concept="37vLTw" id="6RN9TdHnrzW" role="2Oq$k0">
@@ -6403,13 +6492,13 @@
                         <ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
                       </node>
                       <node concept="37vLTw" id="55xYlrlTMR4" role="37wK5m">
-                        <ref role="3cqZAo" node="55xYlrlTKw9" resolve="feedback" />
+                        <ref role="3cqZAo" node="4nDRG5B2lRL" resolve="feedback" />
                       </node>
                       <node concept="37vLTw" id="55xYlrm86xD" role="37wK5m">
-                        <ref role="3cqZAo" node="55xYlrlTKw4" resolve="feedbackKey" />
+                        <ref role="3cqZAo" node="4nDRG5B00$I" resolve="ruleMatchId" />
                       </node>
                       <node concept="37vLTw" id="55xYlrm84Lt" role="37wK5m">
-                        <ref role="3cqZAo" node="55xYlrlTKw6" resolve="feedbackBasis" />
+                        <ref role="3cqZAo" node="4nDRG5CBGAt" resolve="tags" />
                       </node>
                     </node>
                   </node>
@@ -6444,8 +6533,9 @@
                   </node>
                 </node>
                 <node concept="3cpWs6" id="4jcOV4hNvFS" role="3cqZAp">
-                  <node concept="3clFbT" id="4jcOV4hND48" role="3cqZAk">
-                    <property role="3clFbU" value="true" />
+                  <node concept="Rm8GO" id="4nDRG5B2JGG" role="3cqZAk">
+                    <ref role="Rm8GQ" to="w7la:~Supervisor$HandleResult.DROP" resolve="DROP" />
+                    <ref role="1Px2BO" to="w7la:~Supervisor$HandleResult" resolve="Supervisor.HandleResult" />
                   </node>
                 </node>
               </node>
@@ -6463,7 +6553,7 @@
             </node>
             <node concept="2OqwBi" id="1laj_RSiJ2d" role="2ZW6bz">
               <node concept="37vLTw" id="55xYlrlTLXT" role="2Oq$k0">
-                <ref role="3cqZAo" node="55xYlrlTKw2" resolve="ruleMatch" />
+                <ref role="3cqZAo" node="4nDRG5B2lRN" resolve="ruleMatch" />
               </node>
               <node concept="liA8E" id="1laj_RSiJ2f" role="2OqNvi">
                 <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
@@ -6471,13 +6561,15 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3mytCjY$4iZ" role="3cqZAp" />
-        <node concept="3cpWs6" id="4jcOV4hNzSP" role="3cqZAp">
-          <node concept="3clFbT" id="4jcOV4hNzT_" role="3cqZAk" />
+        <node concept="3cpWs6" id="4nDRG5B2Kip" role="3cqZAp">
+          <node concept="Rm8GO" id="4nDRG5B2KBv" role="3cqZAk">
+            <ref role="Rm8GQ" to="w7la:~Supervisor$HandleResult.PROPAGATE" resolve="PROPAGATE" />
+            <ref role="1Px2BO" to="w7la:~Supervisor$HandleResult" resolve="Supervisor.HandleResult" />
+          </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="55xYlrlTKwe" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      <node concept="2AHcQZ" id="4nDRG5B2lRV" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="3o9wrC3sbje" role="jymVt" />
@@ -6558,66 +6650,9 @@
       <node concept="3cqZAl" id="55xYlrm7T9x" role="3clF45" />
       <node concept="3Tm1VV" id="55xYlrm7T9y" role="1B3o_S" />
       <node concept="3clFbS" id="55xYlrm7T9z" role="3clF47" />
+      <node concept="2JFqV2" id="4nDRG5AZ3sh" role="2frcjj" />
     </node>
     <node concept="2tJIrI" id="55xYlrmceZE" role="jymVt" />
-    <node concept="312cEu" id="55xYlrmcfkC" role="jymVt">
-      <property role="TrG5h" value="Stub" />
-      <node concept="3Tm1VV" id="55xYlrmcfkD" role="1B3o_S" />
-      <node concept="3uibUv" id="55xYlrmcg1V" role="EKbjA">
-        <ref role="3uigEE" node="6RN9TdHmQLy" resolve="FeedbackConsumer" />
-      </node>
-      <node concept="3clFb_" id="55xYlrmcgwf" role="jymVt">
-        <property role="TrG5h" value="consumeFeedback" />
-        <node concept="37vLTG" id="55xYlrmcgwg" role="3clF46">
-          <property role="TrG5h" value="template" />
-          <node concept="2sp9CU" id="55xYlrmcgwh" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="55xYlrmcgwi" role="3clF46">
-          <property role="TrG5h" value="rule" />
-          <node concept="3uibUv" id="55xYlrmcgwj" role="1tU5fm">
-            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="55xYlrmcgwk" role="3clF46">
-          <property role="TrG5h" value="target" />
-          <node concept="2sp9CU" id="55xYlrmcgwl" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="55xYlrmcgwm" role="3clF46">
-          <property role="TrG5h" value="feedback" />
-          <node concept="3uibUv" id="55xYlrmcgwn" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="55xYlrmcgwo" role="3clF46">
-          <property role="TrG5h" value="feedbackKey" />
-          <node concept="3uibUv" id="55xYlrmcgwp" role="1tU5fm">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="55xYlrmcgwq" role="3clF46">
-          <property role="TrG5h" value="feedbackBasis" />
-          <node concept="3vKaQO" id="55xYlrmcgwr" role="1tU5fm">
-            <node concept="3uibUv" id="55xYlrmcgws" role="3O5elw">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cqZAl" id="55xYlrmcgwt" role="3clF45" />
-        <node concept="3Tm1VV" id="55xYlrmcgwu" role="1B3o_S" />
-        <node concept="3clFbS" id="55xYlrmcgww" role="3clF47">
-          <node concept="3SKdUt" id="55xYlrmciOR" role="3cqZAp">
-            <node concept="1PaTwC" id="55xYlrmciOS" role="1aUNEU">
-              <node concept="3oM_SD" id="55xYlrmciTl" role="1PaTwD">
-                <property role="3oM_SC" value="NOP" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="55xYlrmcgwx" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-    </node>
     <node concept="3Tm1VV" id="6RN9TdHmQLz" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="6RN9TdHmQY0">
@@ -6952,345 +6987,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="3o9wrC3VM3U">
-    <property role="TrG5h" value="PrincipalNodeReportingSupervisor" />
-    <node concept="2tJIrI" id="3o9wrC3VMfA" role="jymVt" />
-    <node concept="3clFbW" id="3o9wrC3VMfB" role="jymVt">
-      <node concept="37vLTG" id="6RN9TdHomDE" role="3clF46">
-        <property role="TrG5h" value="feedbackConsumer" />
-        <node concept="3uibUv" id="6RN9TdHonzQ" role="1tU5fm">
-          <ref role="3uigEE" node="6RN9TdHmQLy" resolve="FeedbackConsumer" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="3o9wrC3VMfE" role="3clF45" />
-      <node concept="3Tm1VV" id="3o9wrC3VMfF" role="1B3o_S" />
-      <node concept="3clFbS" id="3o9wrC3VMfG" role="3clF47">
-        <node concept="3clFbF" id="6RN9TdHonDD" role="3cqZAp">
-          <node concept="37vLTI" id="6RN9TdHooa3" role="3clFbG">
-            <node concept="37vLTw" id="6RN9TdHoogy" role="37vLTx">
-              <ref role="3cqZAo" node="6RN9TdHomDE" resolve="feedbackConsumer" />
-            </node>
-            <node concept="2OqwBi" id="6RN9TdHonP8" role="37vLTJ">
-              <node concept="Xjq3P" id="6RN9TdHonDB" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6RN9TdHoo14" role="2OqNvi">
-                <ref role="2Oxat5" node="6RN9TdHon5Q" resolve="feedbackConsumer" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3o9wrC3VMgi" role="jymVt" />
-    <node concept="2tJIrI" id="55xYlrmnabE" role="jymVt" />
-    <node concept="3clFb_" id="55xYlrmnaoB" role="jymVt">
-      <property role="TrG5h" value="handleFeedback" />
-      <node concept="3Tm1VV" id="55xYlrmnaoD" role="1B3o_S" />
-      <node concept="10P_77" id="55xYlrmnaoF" role="3clF45" />
-      <node concept="37vLTG" id="55xYlrmnaoG" role="3clF46">
-        <property role="TrG5h" value="ruleMatch" />
-        <node concept="3uibUv" id="55xYlrmnaoH" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="55xYlrmnaoI" role="3clF46">
-        <property role="TrG5h" value="feedbackKey" />
-        <node concept="3uibUv" id="55xYlrmnaoJ" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="55xYlrmnaoK" role="3clF46">
-        <property role="TrG5h" value="feedbackBasis" />
-        <node concept="3uibUv" id="55xYlrmnaoL" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="55xYlrmnaoM" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="55xYlrmnaoN" role="3clF46">
-        <property role="TrG5h" value="feedback" />
-        <node concept="3uibUv" id="55xYlrmnaoO" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="55xYlrmnaoR" role="3clF47">
-        <node concept="3clFbH" id="3o9wrC3VMgr" role="3cqZAp" />
-        <node concept="3cpWs8" id="3o9wrC3VMgs" role="3cqZAp">
-          <node concept="3cpWsn" id="3o9wrC3VMgt" role="3cpWs9">
-            <property role="TrG5h" value="rule" />
-            <node concept="3uibUv" id="6tnA467920x" role="1tU5fm">
-              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
-            </node>
-            <node concept="10QFUN" id="6tnA46791Of" role="33vP2m">
-              <node concept="2OqwBi" id="6tnA46791Oc" role="10QFUP">
-                <node concept="37vLTw" id="55xYlrmncHX" role="2Oq$k0">
-                  <ref role="3cqZAo" node="55xYlrmnaoG" resolve="ruleMatch" />
-                </node>
-                <node concept="liA8E" id="6tnA46791Oe" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
-                </node>
-              </node>
-              <node concept="3uibUv" id="6tnA46791Wb" role="10QFUM">
-                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="3o9wrC3VMgy" role="3cqZAp">
-          <node concept="3clFbS" id="3o9wrC3VMgz" role="3clFbx">
-            <node concept="3clFbH" id="4ekZiHdQanb" role="3cqZAp" />
-            <node concept="3cpWs8" id="3o9wrC3WcLq" role="3cqZAp">
-              <node concept="3cpWsn" id="3o9wrC3WcLt" role="3cpWs9">
-                <property role="TrG5h" value="targetRef" />
-                <node concept="2sp9CU" id="3o9wrC3Wd1k" role="1tU5fm" />
-                <node concept="10Nm6u" id="4ekZiHdQaMY" role="33vP2m" />
-              </node>
-            </node>
-            <node concept="3cpWs8" id="4ekZiHde8bE" role="3cqZAp">
-              <node concept="3cpWsn" id="4ekZiHde8bF" role="3cpWs9">
-                <property role="TrG5h" value="templateRef" />
-                <node concept="2sp9CU" id="4ekZiHde8ti" role="1tU5fm" />
-                <node concept="10Nm6u" id="4ekZiHdegfG" role="33vP2m" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="4ekZiHdQaxE" role="3cqZAp" />
-            <node concept="3clFbJ" id="1laj_RTZd8Y" role="3cqZAp">
-              <node concept="3clFbS" id="1laj_RTZd8Z" role="3clFbx">
-                <node concept="3clFbF" id="1laj_RTZd90" role="3cqZAp">
-                  <node concept="37vLTI" id="1laj_RTZd91" role="3clFbG">
-                    <node concept="2OqwBi" id="4ekZiHde4fm" role="37vLTx">
-                      <node concept="1eOMI4" id="1laj_RTZd92" role="2Oq$k0">
-                        <node concept="10QFUN" id="1laj_RTZd93" role="1eOMHV">
-                          <node concept="3uibUv" id="4ekZiHde3W3" role="10QFUM">
-                            <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
-                          </node>
-                          <node concept="2OqwBi" id="1laj_RTZd95" role="10QFUP">
-                            <node concept="37vLTw" id="55xYlrmndA8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="55xYlrmnaoN" resolve="feedback" />
-                            </node>
-                            <node concept="liA8E" id="1laj_RTZd97" role="2OqNvi">
-                              <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="4ekZiHde4pF" role="2OqNvi">
-                        <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getTarget" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="1laj_RTZdnv" role="37vLTJ">
-                      <ref role="3cqZAo" node="3o9wrC3WcLt" resolve="targetRef" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="4ekZiHde8EB" role="3cqZAp">
-                  <node concept="37vLTI" id="4ekZiHde8ED" role="3clFbG">
-                    <node concept="2OqwBi" id="4ekZiHde8bG" role="37vLTx">
-                      <node concept="1eOMI4" id="4ekZiHde8bH" role="2Oq$k0">
-                        <node concept="10QFUN" id="4ekZiHde8bI" role="1eOMHV">
-                          <node concept="3uibUv" id="4ekZiHde8bJ" role="10QFUM">
-                            <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
-                          </node>
-                          <node concept="2OqwBi" id="4ekZiHde8bK" role="10QFUP">
-                            <node concept="37vLTw" id="55xYlrmndNh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="55xYlrmnaoN" resolve="feedback" />
-                            </node>
-                            <node concept="liA8E" id="4ekZiHde8bM" role="2OqNvi">
-                              <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="4ekZiHde8bN" role="2OqNvi">
-                        <ref role="37wK5l" to="tpfl:4ekZiHddjyV" resolve="getTemplate" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="4ekZiHde8EH" role="37vLTJ">
-                      <ref role="3cqZAo" node="4ekZiHde8bF" resolve="templateRef" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2ZW3vV" id="1laj_RTZd9a" role="3clFbw">
-                <node concept="3uibUv" id="4ekZiHde3Jw" role="2ZW6by">
-                  <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
-                </node>
-                <node concept="2OqwBi" id="1laj_RTZd9c" role="2ZW6bz">
-                  <node concept="37vLTw" id="55xYlrmndoZ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="55xYlrmnaoN" resolve="feedback" />
-                  </node>
-                  <node concept="liA8E" id="1laj_RTZd9e" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="1laj_RTZdHQ" role="3cqZAp" />
-            <node concept="3clFbJ" id="4ekZiHdQ8r0" role="3cqZAp">
-              <node concept="3clFbS" id="4ekZiHdQ8r2" role="3clFbx">
-                <node concept="3clFbF" id="1laj_RTZcXG" role="3cqZAp">
-                  <node concept="37vLTI" id="1laj_RTZcXI" role="3clFbG">
-                    <node concept="37vLTw" id="1laj_RTZcXM" role="37vLTJ">
-                      <ref role="3cqZAo" node="3o9wrC3WcLt" resolve="targetRef" />
-                    </node>
-                    <node concept="2OqwBi" id="3o9wrC3VMid" role="37vLTx">
-                      <node concept="37vLTw" id="6tnA467925_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
-                      </node>
-                      <node concept="liA8E" id="3o9wrC3VMii" role="2OqNvi">
-                        <ref role="37wK5l" to="ugy2:7nPD14Ob4em" resolve="targetRef" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="4ekZiHdRyEu" role="3cqZAp">
-                  <node concept="37vLTI" id="4ekZiHdRyNF" role="3clFbG">
-                    <node concept="37vLTw" id="4ekZiHdRyEs" role="37vLTJ">
-                      <ref role="3cqZAo" node="4ekZiHde8bF" resolve="templateRef" />
-                    </node>
-                    <node concept="2OqwBi" id="4ekZiHdRyZv" role="37vLTx">
-                      <node concept="37vLTw" id="6tnA46792CY" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
-                      </node>
-                      <node concept="liA8E" id="4ekZiHdRz8V" role="2OqNvi">
-                        <ref role="37wK5l" to="ugy2:7nPD14Ob4lt" resolve="templateRef" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbC" id="4ekZiHdQ8KF" role="3clFbw">
-                <node concept="10Nm6u" id="4ekZiHdQ8OO" role="3uHU7w" />
-                <node concept="37vLTw" id="4ekZiHdQ8AS" role="3uHU7B">
-                  <ref role="3cqZAo" node="3o9wrC3WcLt" resolve="targetRef" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="4ekZiHdQ811" role="3cqZAp" />
-            <node concept="3clFbJ" id="3o9wrC3WedI" role="3cqZAp">
-              <node concept="3clFbS" id="3o9wrC3WedK" role="3clFbx">
-                <node concept="3clFbH" id="3o9wrC3WiBc" role="3cqZAp" />
-                <node concept="3clFbF" id="7NX8kJ71b3V" role="3cqZAp">
-                  <node concept="2OqwBi" id="7NX8kJ71b3W" role="3clFbG">
-                    <node concept="37vLTw" id="7NX8kJ71b3X" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6RN9TdHon5Q" resolve="feedbackConsumer" />
-                    </node>
-                    <node concept="liA8E" id="7NX8kJ71b3Y" role="2OqNvi">
-                      <ref role="37wK5l" node="55xYlrm7T9v" resolve="consumeFeedback" />
-                      <node concept="37vLTw" id="7NX8kJ71b3Z" role="37wK5m">
-                        <ref role="3cqZAo" node="4ekZiHde8bF" resolve="templateRef" />
-                      </node>
-                      <node concept="37vLTw" id="5rVYEA6m0GN" role="37wK5m">
-                        <ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
-                      </node>
-                      <node concept="37vLTw" id="7NX8kJ71b40" role="37wK5m">
-                        <ref role="3cqZAo" node="3o9wrC3WcLt" resolve="targetRef" />
-                      </node>
-                      <node concept="37vLTw" id="55xYlrmne0t" role="37wK5m">
-                        <ref role="3cqZAo" node="55xYlrmnaoN" resolve="feedback" />
-                      </node>
-                      <node concept="37vLTw" id="55xYlrmnee8" role="37wK5m">
-                        <ref role="3cqZAo" node="55xYlrmnaoI" resolve="feedbackKey" />
-                      </node>
-                      <node concept="37vLTw" id="55xYlrmosCS" role="37wK5m">
-                        <ref role="3cqZAo" node="55xYlrmnaoK" resolve="feedbackBasis" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="1laj_RSCjSy" role="3cqZAp" />
-                <node concept="3SKdUt" id="3o9wrC3VMhr" role="3cqZAp">
-                  <node concept="1PaTwC" id="3o9wrC3VMhs" role="1aUNEU">
-                    <node concept="3oM_SD" id="3o9wrC3VMht" role="1PaTwD">
-                      <property role="3oM_SC" value="stop" />
-                    </node>
-                    <node concept="3oM_SD" id="3o9wrC3VMhu" role="1PaTwD">
-                      <property role="3oM_SC" value="the" />
-                    </node>
-                    <node concept="3oM_SD" id="3o9wrC3VMhv" role="1PaTwD">
-                      <property role="3oM_SC" value="error" />
-                    </node>
-                    <node concept="3oM_SD" id="3o9wrC3VMhw" role="1PaTwD">
-                      <property role="3oM_SC" value="from" />
-                    </node>
-                    <node concept="3oM_SD" id="3o9wrC3VMhx" role="1PaTwD">
-                      <property role="3oM_SC" value="being" />
-                    </node>
-                    <node concept="3oM_SD" id="3o9wrC3VMhy" role="1PaTwD">
-                      <property role="3oM_SC" value="propagated," />
-                    </node>
-                    <node concept="3oM_SD" id="3o9wrC3VMhz" role="1PaTwD">
-                      <property role="3oM_SC" value="enable" />
-                    </node>
-                    <node concept="3oM_SD" id="3o9wrC3VMh$" role="1PaTwD">
-                      <property role="3oM_SC" value="recover" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs6" id="3o9wrC3VMhW" role="3cqZAp">
-                  <node concept="3clFbT" id="3o9wrC3VMhX" role="3cqZAk">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3y3z36" id="3o9wrC3VMib" role="3clFbw">
-                <node concept="10Nm6u" id="3o9wrC3VMic" role="3uHU7w" />
-                <node concept="37vLTw" id="3o9wrC3Weya" role="3uHU7B">
-                  <ref role="3cqZAo" node="3o9wrC3WcLt" resolve="targetRef" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="22lmx$" id="1laj_RTZc_0" role="3clFbw">
-            <node concept="2ZW3vV" id="1laj_RTZc_1" role="3uHU7w">
-              <node concept="3uibUv" id="4ekZiHdDRLC" role="2ZW6by">
-                <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
-              </node>
-              <node concept="2OqwBi" id="1laj_RTZc_3" role="2ZW6bz">
-                <node concept="37vLTw" id="55xYlrmndbQ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="55xYlrmnaoN" resolve="feedback" />
-                </node>
-                <node concept="liA8E" id="1laj_RTZc_5" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationFeedback.getDetails()" resolve="getDetails" />
-                </node>
-              </node>
-            </node>
-            <node concept="2ZW3vV" id="1laj_RTZc_6" role="3uHU7B">
-              <node concept="3uibUv" id="1laj_RTZc_7" role="2ZW6by">
-                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
-              </node>
-              <node concept="2OqwBi" id="1laj_RTZc_8" role="2ZW6bz">
-                <node concept="37vLTw" id="55xYlrmncVd" role="2Oq$k0">
-                  <ref role="3cqZAo" node="55xYlrmnaoG" resolve="ruleMatch" />
-                </node>
-                <node concept="liA8E" id="1laj_RTZc_a" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="3o9wrC3VMik" role="3cqZAp">
-          <node concept="3clFbT" id="3o9wrC3VMil" role="3cqZAk" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="55xYlrmnaoS" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="55xYlrmneZn" role="jymVt" />
-    <node concept="312cEg" id="6RN9TdHon5Q" role="jymVt">
-      <property role="TrG5h" value="feedbackConsumer" />
-      <node concept="3Tm6S6" id="6RN9TdHomTf" role="1B3o_S" />
-      <node concept="3uibUv" id="6RN9TdHonpD" role="1tU5fm">
-        <ref role="3uigEE" node="6RN9TdHmQLy" resolve="FeedbackConsumer" />
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="3o9wrC3VM3V" role="1B3o_S" />
-    <node concept="3uibUv" id="3o9wrC3WiX8" role="1zkMxy">
-      <ref role="3uigEE" node="3o9wrC3s0ii" resolve="DefaultSupervisor" />
-    </node>
-  </node>
   <node concept="312cEu" id="39eNUjlSKNI">
     <property role="TrG5h" value="TemplateTraceImpl" />
     <property role="3GE5qa" value="trace" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index 104d1200..29f91d7f 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -1389,7 +1389,7 @@
             </node>
             <node concept="2ShNRf" id="3o9wrC3WGRN" role="33vP2m">
               <node concept="1pGfFk" id="5rVYEA66sG1" role="2ShVmc">
-                <ref role="37wK5l" to="hano:3o9wrC3VMfB" resolve="PrincipalNodeReportingSupervisor" />
+                <ref role="37wK5l" to="hano:3o9wrC3sC_c" />
                 <node concept="37vLTw" id="WJTIIp8IAA" role="37wK5m">
                   <ref role="3cqZAo" node="WJTIIp8A0t" resolve="failuresSink" />
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index b5223438..b0837b75 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -3545,8 +3545,14 @@
                     <node concept="1pGfFk" id="6RN9TdHofDR" role="2ShVmc">
                       <ref role="37wK5l" to="hano:3o9wrC3sC_c" resolve="FeedbackReportingSupervisor" />
                       <node concept="2ShNRf" id="55xYlrmck$T" role="37wK5m">
-                        <node concept="HV5vD" id="55xYlrmcljP" role="2ShVmc">
-                          <ref role="HV5vE" to="hano:55xYlrmcfkC" resolve="FeedbackConsumer.Stub" />
+                        <node concept="YeOm9" id="4nDRG5AZ8h7" role="2ShVmc">
+                          <node concept="1Y3b0j" id="4nDRG5AZ8ha" role="YeSDq">
+                            <property role="2bfB8j" value="true" />
+                            <property role="373rjd" value="true" />
+                            <ref role="1Y3XeK" to="hano:6RN9TdHmQLy" resolve="FeedbackConsumer" />
+                            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                            <node concept="3Tm1VV" id="4nDRG5AZ8hb" role="1B3o_S" />
+                          </node>
                         </node>
                       </node>
                     </node>