diff --git a/build.xml b/build.xml
index d43ee9a4..793b173f 100644
--- a/build.xml
+++ b/build.xml
@@ -1493,6 +1493,7 @@
           <language id="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" />
           <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
           <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
           <language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
           <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
           <language id="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" />
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 4bf463b0..9b5bfdbc 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
@@ -37,6 +37,7 @@
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="xnrr" ref="r:4fd33103-fc30-42f4-a8cf-d1e858f21988(jetbrains.mps.lang.coderules.program.analysis)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -4111,6 +4112,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2Y70AYEegr_" role="3cqZAp">
+          <node concept="37vLTI" id="2Y70AYEegrB" role="3clFbG">
+            <node concept="2OqwBi" id="2Y70AYEegQP" role="37vLTJ">
+              <node concept="Xjq3P" id="2Y70AYEegRq" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2Y70AYEegQS" role="2OqNvi">
+                <ref role="2Oxat5" node="2Y70AYEegrx" resolve="messageHandler" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2Y70AYEegrF" role="37vLTx">
+              <ref role="3cqZAo" node="2Y70AYEegeI" resolve="messageHandler" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="1hX44vNnpfY" role="3cqZAp">
           <node concept="1rXfSq" id="1hX44vNnpfX" role="3clFbG">
             <ref role="37wK5l" node="1hX44vNnpfT" resolve="collectMacroTables" />
@@ -4132,6 +4146,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="2Y70AYEegeI" role="3clF46">
+        <property role="TrG5h" value="messageHandler" />
+        <node concept="3uibUv" id="2Y70AYEegq6" role="1tU5fm">
+          <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="4JJCDIn5EFu" role="jymVt" />
     <node concept="3clFb_" id="4JJCDIn5F0n" role="jymVt">
@@ -4215,27 +4235,103 @@
             <property role="TrG5h" value="macroTable" />
           </node>
         </node>
-        <node concept="3clFbH" id="6UWSvq59Y1y" role="3cqZAp" />
-        <node concept="YS8fn" id="6UWSvq5a4Ig" role="3cqZAp">
-          <node concept="2ShNRf" id="6UWSvq5a5d0" role="YScLw">
-            <node concept="1pGfFk" id="6UWSvq5a5Ir" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-              <node concept="3cpWs3" id="6UWSvq5a7lN" role="37wK5m">
-                <node concept="3cpWs3" id="6UWSvq5a6TJ" role="3uHU7B">
-                  <node concept="Xl_RD" id="6UWSvq5a5OB" role="3uHU7B">
-                    <property role="Xl_RC" value="no macro template for concept \&quot;" />
-                  </node>
-                  <node concept="37vLTw" id="6UWSvq5a6XQ" role="3uHU7w">
-                    <ref role="3cqZAo" node="4nxCIBqyARP" resolve="concept" />
+        <node concept="3SKdUt" id="2Y70AYEelAT" role="3cqZAp">
+          <node concept="1PaTwC" id="2Y70AYEelAU" role="3ndbpf">
+            <node concept="3oM_SD" id="2Y70AYEelAV" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Y70AYEelAW" role="1PaTwD">
+              <property role="3oM_SC" value="assert" />
+            </node>
+            <node concept="3oM_SD" id="2Y70AYEelAX" role="1PaTwD">
+              <property role="3oM_SC" value="messageHandler" />
+            </node>
+            <node concept="3oM_SD" id="2Y70AYEelAY" role="1PaTwD">
+              <property role="3oM_SC" value="!=" />
+            </node>
+            <node concept="3oM_SD" id="2Y70AYEelAZ" role="1PaTwD">
+              <property role="3oM_SC" value="null" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2Y70AYEelB0" role="3cqZAp">
+          <node concept="3clFbS" id="2Y70AYEelB1" role="3clFbx">
+            <node concept="3clFbF" id="2Y70AYEelB2" role="3cqZAp">
+              <node concept="2OqwBi" id="2Y70AYEelB3" role="3clFbG">
+                <node concept="37vLTw" id="2Y70AYEelB4" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2Y70AYEegrx" resolve="messageHandler" />
+                </node>
+                <node concept="liA8E" id="2Y70AYEelB5" role="2OqNvi">
+                  <ref role="37wK5l" to="et5u:~IMessageHandler.handle(jetbrains.mps.messages.IMessage)" resolve="handle" />
+                  <node concept="2YIFZM" id="2Y70AYEelB6" role="37wK5m">
+                    <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String)" resolve="createMessage" />
+                    <ref role="1Pybhc" to="et5u:~Message" resolve="Message" />
+                    <node concept="Rm8GO" id="2Y70AYEelB7" role="37wK5m">
+                      <ref role="Rm8GQ" to="et5u:~MessageKind.WARNING" resolve="WARNING" />
+                      <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+                    </node>
+                    <node concept="2OqwBi" id="2Y70AYEelB8" role="37wK5m">
+                      <node concept="3VsKOn" id="2Y70AYEelB9" role="2Oq$k0">
+                        <ref role="3VsUkX" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
+                      </node>
+                      <node concept="liA8E" id="2Y70AYEelBa" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
+                      </node>
+                    </node>
+                    <node concept="3cpWs3" id="2Y70AYEemPN" role="37wK5m">
+                      <node concept="3cpWs3" id="2Y70AYEemPO" role="3uHU7B">
+                        <node concept="Xl_RD" id="2Y70AYEemPP" role="3uHU7B">
+                          <property role="Xl_RC" value="no macro template for concept \&quot;" />
+                        </node>
+                        <node concept="37vLTw" id="2Y70AYEemPQ" role="3uHU7w">
+                          <ref role="3cqZAo" node="4nxCIBqyARP" resolve="concept" />
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="2Y70AYEemPR" role="3uHU7w">
+                        <property role="Xl_RC" value="\&quot;" />
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="Xl_RD" id="6UWSvq5a87Q" role="3uHU7w">
-                  <property role="Xl_RC" value="\&quot;" />
+              </node>
+            </node>
+            <node concept="3cpWs6" id="2Y70AYEelBg" role="3cqZAp">
+              <node concept="10Nm6u" id="2Y70AYEelBh" role="3cqZAk" />
+            </node>
+            <node concept="3clFbH" id="2Y70AYEelBi" role="3cqZAp" />
+          </node>
+          <node concept="3y3z36" id="2Y70AYEelBj" role="3clFbw">
+            <node concept="10Nm6u" id="2Y70AYEelBk" role="3uHU7w" />
+            <node concept="37vLTw" id="2Y70AYEelBl" role="3uHU7B">
+              <ref role="3cqZAo" node="2Y70AYEegrx" resolve="messageHandler" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="2Y70AYEelBm" role="9aQIa">
+            <node concept="3clFbS" id="2Y70AYEelBn" role="9aQI4">
+              <node concept="YS8fn" id="6UWSvq5a4Ig" role="3cqZAp">
+                <node concept="2ShNRf" id="6UWSvq5a5d0" role="YScLw">
+                  <node concept="1pGfFk" id="6UWSvq5a5Ir" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                    <node concept="3cpWs3" id="6UWSvq5a7lN" role="37wK5m">
+                      <node concept="3cpWs3" id="6UWSvq5a6TJ" role="3uHU7B">
+                        <node concept="Xl_RD" id="6UWSvq5a5OB" role="3uHU7B">
+                          <property role="Xl_RC" value="no macro template for concept \&quot;" />
+                        </node>
+                        <node concept="37vLTw" id="6UWSvq5a6XQ" role="3uHU7w">
+                          <ref role="3cqZAo" node="4nxCIBqyARP" resolve="concept" />
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="6UWSvq5a87Q" role="3uHU7w">
+                        <property role="Xl_RC" value="\&quot;" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="6UWSvq59Y1y" role="3cqZAp" />
       </node>
       <node concept="16euLQ" id="1eKXYsjIb$d" role="16eVyc">
         <property role="TrG5h" value="Cfg" />
@@ -4311,22 +4407,97 @@
             <property role="TrG5h" value="macroTable" />
           </node>
         </node>
-        <node concept="3clFbH" id="6UWSvq5a9vB" role="3cqZAp" />
-        <node concept="YS8fn" id="6UWSvq5a9vC" role="3cqZAp">
-          <node concept="2ShNRf" id="6UWSvq5a9vD" role="YScLw">
-            <node concept="1pGfFk" id="6UWSvq5a9vE" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-              <node concept="3cpWs3" id="6UWSvq5a9vF" role="37wK5m">
-                <node concept="3cpWs3" id="6UWSvq5a9vG" role="3uHU7B">
-                  <node concept="Xl_RD" id="6UWSvq5a9vH" role="3uHU7B">
-                    <property role="Xl_RC" value="no macro template  \&quot;" />
-                  </node>
-                  <node concept="37vLTw" id="6UWSvq5adtU" role="3uHU7w">
-                    <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="templateId" />
+        <node concept="3SKdUt" id="2Y70AYEeljo" role="3cqZAp">
+          <node concept="1PaTwC" id="2Y70AYEeljp" role="3ndbpf">
+            <node concept="3oM_SD" id="2Y70AYEeljr" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="2Y70AYEel$$" role="1PaTwD">
+              <property role="3oM_SC" value="assert" />
+            </node>
+            <node concept="3oM_SD" id="2Y70AYEel$R" role="1PaTwD">
+              <property role="3oM_SC" value="messageHandler" />
+            </node>
+            <node concept="3oM_SD" id="2Y70AYEel_Y" role="1PaTwD">
+              <property role="3oM_SC" value="!=" />
+            </node>
+            <node concept="3oM_SD" id="2Y70AYEelAz" role="1PaTwD">
+              <property role="3oM_SC" value="null" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2Y70AYEegYv" role="3cqZAp">
+          <node concept="3clFbS" id="2Y70AYEegYx" role="3clFbx">
+            <node concept="3clFbF" id="2Y70AYEehEv" role="3cqZAp">
+              <node concept="2OqwBi" id="2Y70AYEehGn" role="3clFbG">
+                <node concept="37vLTw" id="2Y70AYEehEt" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2Y70AYEegrx" resolve="messageHandler" />
+                </node>
+                <node concept="liA8E" id="2Y70AYEehNl" role="2OqNvi">
+                  <ref role="37wK5l" to="et5u:~IMessageHandler.handle(jetbrains.mps.messages.IMessage)" resolve="handle" />
+                  <node concept="2YIFZM" id="2Y70AYEehR8" role="37wK5m">
+                    <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String)" resolve="createMessage" />
+                    <ref role="1Pybhc" to="et5u:~Message" resolve="Message" />
+                    <node concept="Rm8GO" id="2Y70AYEehVC" role="37wK5m">
+                      <ref role="Rm8GQ" to="et5u:~MessageKind.WARNING" resolve="WARNING" />
+                      <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+                    </node>
+                    <node concept="2OqwBi" id="2Y70AYEeiAy" role="37wK5m">
+                      <node concept="3VsKOn" id="2Y70AYEei6U" role="2Oq$k0">
+                        <ref role="3VsUkX" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
+                      </node>
+                      <node concept="liA8E" id="2Y70AYEej54" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
+                      </node>
+                    </node>
+                    <node concept="3cpWs3" id="2Y70AYEejfE" role="37wK5m">
+                      <node concept="3cpWs3" id="2Y70AYEejfF" role="3uHU7B">
+                        <node concept="Xl_RD" id="2Y70AYEejfG" role="3uHU7B">
+                          <property role="Xl_RC" value="no macro template  \&quot;" />
+                        </node>
+                        <node concept="37vLTw" id="2Y70AYEejfH" role="3uHU7w">
+                          <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="templateId" />
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="2Y70AYEejfI" role="3uHU7w">
+                        <property role="Xl_RC" value="\&quot;" />
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="Xl_RD" id="6UWSvq5a9vJ" role="3uHU7w">
-                  <property role="Xl_RC" value="\&quot;" />
+              </node>
+            </node>
+            <node concept="3cpWs6" id="2Y70AYEekrv" role="3cqZAp">
+              <node concept="10Nm6u" id="2Y70AYEek_5" role="3cqZAk" />
+            </node>
+            <node concept="3clFbH" id="2Y70AYEel2S" role="3cqZAp" />
+          </node>
+          <node concept="3y3z36" id="2Y70AYEeh$p" role="3clFbw">
+            <node concept="10Nm6u" id="2Y70AYEehD9" role="3uHU7w" />
+            <node concept="37vLTw" id="2Y70AYEehrz" role="3uHU7B">
+              <ref role="3cqZAo" node="2Y70AYEegrx" resolve="messageHandler" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="2Y70AYEejwr" role="9aQIa">
+            <node concept="3clFbS" id="2Y70AYEejws" role="9aQI4">
+              <node concept="YS8fn" id="6UWSvq5a9vC" role="3cqZAp">
+                <node concept="2ShNRf" id="6UWSvq5a9vD" role="YScLw">
+                  <node concept="1pGfFk" id="6UWSvq5a9vE" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                    <node concept="3cpWs3" id="6UWSvq5a9vF" role="37wK5m">
+                      <node concept="3cpWs3" id="6UWSvq5a9vG" role="3uHU7B">
+                        <node concept="Xl_RD" id="6UWSvq5a9vH" role="3uHU7B">
+                          <property role="Xl_RC" value="no macro template  \&quot;" />
+                        </node>
+                        <node concept="37vLTw" id="6UWSvq5adtU" role="3uHU7w">
+                          <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="templateId" />
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="6UWSvq5a9vJ" role="3uHU7w">
+                        <property role="Xl_RC" value="\&quot;" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -4426,6 +4597,13 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="2Y70AYEegrx" role="jymVt">
+      <property role="TrG5h" value="messageHandler" />
+      <node concept="3Tm6S6" id="2Y70AYEegry" role="1B3o_S" />
+      <node concept="3uibUv" id="2Y70AYEegr$" role="1tU5fm">
+        <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="1hX44vNnjHa" role="jymVt" />
   </node>
   <node concept="312cEu" id="1HWyn8jvsHb">
@@ -4951,14 +5129,6 @@
       <node concept="3cqZAl" id="7DvO2M9VeM2" role="3clF45" />
       <node concept="3Tm1VV" id="78H58oeCgeV" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2M9VeM4" role="3clF47">
-        <node concept="3clFbF" id="7DvO2M9VeM5" role="3cqZAp">
-          <node concept="1rXfSq" id="7DvO2M9VeM6" role="3clFbG">
-            <ref role="37wK5l" node="7DvO2M9VeMb" resolve="init" />
-            <node concept="37vLTw" id="7DvO2M9VeM7" role="37wK5m">
-              <ref role="3cqZAo" node="7DvO2M9VeM8" resolve="descriptors" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="72RDgIN3TIX" role="3cqZAp">
           <node concept="37vLTI" id="72RDgIN3TIZ" role="3clFbG">
             <node concept="2OqwBi" id="72RDgIN3TTV" role="37vLTJ">
@@ -4972,6 +5142,27 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2Y70AYEbe1S" role="3cqZAp">
+          <node concept="37vLTI" id="2Y70AYEbe1U" role="3clFbG">
+            <node concept="2OqwBi" id="2Y70AYEbeZE" role="37vLTJ">
+              <node concept="Xjq3P" id="2Y70AYEbf0r" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2Y70AYEbeZH" role="2OqNvi">
+                <ref role="2Oxat5" node="2Y70AYEbe1O" resolve="messageHandler" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2Y70AYEbe1Y" role="37vLTx">
+              <ref role="3cqZAo" node="2Y70AYEbbjP" resolve="messageHandler" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7DvO2M9VeM5" role="3cqZAp">
+          <node concept="1rXfSq" id="7DvO2M9VeM6" role="3clFbG">
+            <ref role="37wK5l" node="7DvO2M9VeMb" resolve="init" />
+            <node concept="37vLTw" id="7DvO2M9VeM7" role="37wK5m">
+              <ref role="3cqZAo" node="7DvO2M9VeM8" resolve="descriptors" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="7DvO2M9VeM8" role="3clF46">
         <property role="TrG5h" value="descriptors" />
@@ -4989,6 +5180,12 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
+      <node concept="37vLTG" id="2Y70AYEbbjP" role="3clF46">
+        <property role="TrG5h" value="messageHandler" />
+        <node concept="3uibUv" id="2Y70AYEbcAb" role="1tU5fm">
+          <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7P_FdVPFS$d" role="jymVt" />
     <node concept="3clFb_" id="20Ay2VeR9qk" role="jymVt">
@@ -5275,6 +5472,9 @@
                 <node concept="37vLTw" id="6UWSvq5d6LC" role="37wK5m">
                   <ref role="3cqZAo" node="6UWSvq5d6Lz" resolve="macroManifests" />
                 </node>
+                <node concept="37vLTw" id="2Y70AYEfWEu" role="37wK5m">
+                  <ref role="3cqZAo" node="2Y70AYEbe1O" resolve="messageHandler" />
+                </node>
               </node>
             </node>
           </node>
@@ -5420,6 +5620,13 @@
         <ref role="3uigEE" to="av0y:~IncrementalProgramSpec" resolve="IncrementalProgramSpec" />
       </node>
     </node>
+    <node concept="312cEg" id="2Y70AYEbe1O" role="jymVt">
+      <property role="TrG5h" value="messageHandler" />
+      <node concept="3Tm6S6" id="2Y70AYEbe1P" role="1B3o_S" />
+      <node concept="3uibUv" id="2Y70AYEbe1R" role="1tU5fm">
+        <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="7P_FdVPFLhr" role="jymVt" />
     <node concept="3Tm1VV" id="CGeqIk8WWV" role="1B3o_S" />
   </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
index aa6e6745..d7be5b28 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
@@ -26,6 +26,7 @@
     <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: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:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
index 179bb76b..fd357935 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
@@ -29,6 +29,9 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="7ed7" ref="r:48788b84-8ecd-41f5-ad03-cc8c09b1f186(jetbrains.mps.lang.coderules.analysis)" />
     <import index="zuft" ref="r:65f97255-4bb1-4783-acd6-a4ed5a1088e2(jetbrains.mps.typechecking.testlang.types)" />
+    <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
+    <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
@@ -61,6 +64,12 @@
       </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="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </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" />
@@ -71,9 +80,15 @@
       <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="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
       <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="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
@@ -99,6 +114,7 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -119,6 +135,10 @@
         <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">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -133,7 +153,11 @@
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="1350122676458893092" name="text" index="3ndbpf" />
       </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </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" />
@@ -466,6 +490,56 @@
                   </node>
                 </node>
               </node>
+              <node concept="3cpWs8" id="2Y70AYEbnBU" role="3cqZAp">
+                <node concept="3cpWsn" id="2Y70AYEbnBV" role="3cpWs9">
+                  <property role="TrG5h" value="errorMsgHandler" />
+                  <node concept="3uibUv" id="2Y70AYEcpqy" role="1tU5fm">
+                    <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+                  </node>
+                  <node concept="2ShNRf" id="2Y70AYEbnBW" role="33vP2m">
+                    <node concept="YeOm9" id="2Y70AYEbnBX" role="2ShVmc">
+                      <node concept="1Y3b0j" id="2Y70AYEbnBY" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                        <ref role="1Y3XeK" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+                        <node concept="3Tm1VV" id="2Y70AYEbnBZ" role="1B3o_S" />
+                        <node concept="3clFb_" id="2Y70AYEbnC0" role="jymVt">
+                          <property role="TrG5h" value="handle" />
+                          <node concept="3Tm1VV" id="2Y70AYEbnC1" role="1B3o_S" />
+                          <node concept="3cqZAl" id="2Y70AYEbnC2" role="3clF45" />
+                          <node concept="37vLTG" id="2Y70AYEbnC3" role="3clF46">
+                            <property role="TrG5h" value="msg" />
+                            <node concept="3uibUv" id="2Y70AYEcp_m" role="1tU5fm">
+                              <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                            </node>
+                          </node>
+                          <node concept="3clFbS" id="2Y70AYEbnC5" role="3clF47">
+                            <node concept="YS8fn" id="2Y70AYEbnC6" role="3cqZAp">
+                              <node concept="2ShNRf" id="2Y70AYEbnC7" role="YScLw">
+                                <node concept="1pGfFk" id="2Y70AYEbnC8" role="2ShVmc">
+                                  <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                                  <node concept="2OqwBi" id="2Y70AYEbnC9" role="37wK5m">
+                                    <node concept="37vLTw" id="2Y70AYEbnCa" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="2Y70AYEbnC3" resolve="msg" />
+                                    </node>
+                                    <node concept="liA8E" id="2Y70AYEbnCb" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="2Y70AYEbnCc" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="2Y70AYEcpao" role="3cqZAp" />
               <node concept="3cpWs8" id="tyIfzC3OTB" role="3cqZAp">
                 <node concept="3cpWsn" id="tyIfzC3OTC" role="3cpWs9">
                   <property role="TrG5h" value="launcher" />
@@ -484,6 +558,9 @@
                         </node>
                         <node concept="I4A8Y" id="tyIfzC40_M" role="2OqNvi" />
                       </node>
+                      <node concept="37vLTw" id="2Y70AYEcq0D" role="37wK5m">
+                        <ref role="3cqZAo" node="2Y70AYEbnBV" resolve="errorMsgHandler" />
+                      </node>
                       <node concept="10M0yZ" id="tyIfzC5MVS" role="37wK5m">
                         <ref role="3cqZAo" to="tj24:4t7Xo7inNvw" resolve="TYPECHECK" />
                         <ref role="1PxDUh" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
index 81f54ae6..73e63fa7 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
@@ -6,6 +6,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
@@ -25,6 +26,7 @@
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -71,6 +73,9 @@
       <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="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
       <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" />
@@ -178,6 +183,9 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </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">
@@ -185,6 +193,18 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <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>
+    </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" />
@@ -219,10 +239,6 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
-        <property id="8575328350543493365" name="message" index="huDt6" />
-        <property id="2423417345669755629" name="filter" index="1eyWvh" />
-      </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
         <property id="709746936026609031" name="linkId" index="3V$3ak" />
         <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
@@ -351,6 +367,55 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="2Y70AYEbnBU" role="3cqZAp">
+          <node concept="3cpWsn" id="2Y70AYEbnBV" role="3cpWs9">
+            <property role="TrG5h" value="nullHandler" />
+            <node concept="3uibUv" id="2Y70AYEcpqy" role="1tU5fm">
+              <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+            </node>
+            <node concept="2ShNRf" id="2Y70AYEbnBW" role="33vP2m">
+              <node concept="YeOm9" id="2Y70AYEbnBX" role="2ShVmc">
+                <node concept="1Y3b0j" id="2Y70AYEbnBY" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <ref role="1Y3XeK" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+                  <node concept="3Tm1VV" id="2Y70AYEbnBZ" role="1B3o_S" />
+                  <node concept="3clFb_" id="2Y70AYEbnC0" role="jymVt">
+                    <property role="TrG5h" value="handle" />
+                    <node concept="3Tm1VV" id="2Y70AYEbnC1" role="1B3o_S" />
+                    <node concept="3cqZAl" id="2Y70AYEbnC2" role="3clF45" />
+                    <node concept="37vLTG" id="2Y70AYEbnC3" role="3clF46">
+                      <property role="TrG5h" value="msg" />
+                      <node concept="3uibUv" id="2Y70AYEcp_m" role="1tU5fm">
+                        <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                      </node>
+                    </node>
+                    <node concept="3clFbS" id="2Y70AYEbnC5" role="3clF47">
+                      <node concept="YS8fn" id="2Y70AYEbnC6" role="3cqZAp">
+                        <node concept="2ShNRf" id="2Y70AYEbnC7" role="YScLw">
+                          <node concept="1pGfFk" id="2Y70AYEbnC8" role="2ShVmc">
+                            <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                            <node concept="2OqwBi" id="2Y70AYEbnC9" role="37wK5m">
+                              <node concept="37vLTw" id="2Y70AYEbnCa" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2Y70AYEbnC3" resolve="msg" />
+                              </node>
+                              <node concept="liA8E" id="2Y70AYEbnCb" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="2Y70AYEbnCc" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="2FNFm8neJu6" role="3cqZAp">
           <node concept="3cpWsn" id="2FNFm8neJvq" role="3cpWs9">
             <property role="TrG5h" value="launcher" />
@@ -369,6 +434,9 @@
                     <ref role="3cqZAo" node="2FNFm8nf1EO" resolve="target" />
                   </node>
                 </node>
+                <node concept="37vLTw" id="2Y70AYEczyJ" role="37wK5m">
+                  <ref role="3cqZAo" node="2Y70AYEbnBV" resolve="nullHandler" />
+                </node>
                 <node concept="10M0yZ" id="2FNFm8neJ$3" role="37wK5m">
                   <ref role="3cqZAo" to="tj24:4t7Xo7inNvw" resolve="TYPECHECK" />
                   <ref role="1PxDUh" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
@@ -391,6 +459,13 @@
         <property role="TrG5h" value="target" />
         <node concept="3Tqbb2" id="2FNFm8nf1EN" role="1tU5fm" />
       </node>
+      <node concept="P$JXv" id="2Y70AYEcyd9" role="lGtFl">
+        <node concept="TZ5HA" id="2Y70AYEcyda" role="TZ5H$">
+          <node concept="1dT_AC" id="2Y70AYEcydb" role="1dT_Ay">
+            <property role="1dT_AB" value="Only used from tests" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="tyIfzC4jgp" role="jymVt" />
     <node concept="3clFbW" id="tyIfzC440j" role="jymVt">
@@ -404,6 +479,12 @@
         <property role="TrG5h" value="demoModel" />
         <node concept="H_c77" id="tyIfzC440n" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="2Y70AYEcl31" role="3clF46">
+        <property role="TrG5h" value="messageHandler" />
+        <node concept="3uibUv" id="2Y70AYEcliU" role="1tU5fm">
+          <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="tyIfzC440q" role="3clF45" />
       <node concept="3Tm1VV" id="tyIfzC440r" role="1B3o_S" />
       <node concept="3clFbS" id="tyIfzC440s" role="3clF47">
@@ -464,13 +545,12 @@
                 <node concept="37vLTw" id="tyIfzC4hIk" role="37wK5m">
                   <ref role="3cqZAo" node="tyIfzC440k" resolve="repo" />
                 </node>
+                <node concept="37vLTw" id="2Y70AYEcmqB" role="37wK5m">
+                  <ref role="3cqZAo" node="2Y70AYEcl31" resolve="messageHandler" />
+                </node>
               </node>
             </node>
           </node>
-          <node concept="15s5l7" id="6gZak$AUFrx" role="lGtFl">
-            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;" />
-            <property role="huDt6" value="all typesystem messages" />
-          </node>
         </node>
         <node concept="3clFbF" id="tyIfzC4hIu" role="3cqZAp">
           <node concept="37vLTI" id="tyIfzC4hIv" role="3clFbG">
@@ -506,6 +586,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2Y70AYEckIe" role="3cqZAp">
+          <node concept="37vLTI" id="2Y70AYEckIf" role="3clFbG">
+            <node concept="2OqwBi" id="2Y70AYEckIg" role="37vLTJ">
+              <node concept="Xjq3P" id="2Y70AYEckIh" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2Y70AYEckIi" role="2OqNvi">
+                <ref role="2Oxat5" node="2Y70AYEcifV" resolve="messageHandler" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2Y70AYEcl$T" role="37vLTx">
+              <ref role="3cqZAo" node="2Y70AYEcl31" resolve="messageHandler" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="tyIfzC0ZQK" role="jymVt" />
@@ -520,6 +613,12 @@
         <property role="TrG5h" value="demoModel" />
         <node concept="H_c77" id="tyIfzC2wEW" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="2Y70AYEch_7" role="3clF46">
+        <property role="TrG5h" value="messageHandler" />
+        <node concept="3uibUv" id="2Y70AYEci5t" role="1tU5fm">
+          <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+        </node>
+      </node>
       <node concept="37vLTG" id="tyIfzC106r" role="3clF46">
         <property role="TrG5h" value="qkind" />
         <node concept="3uibUv" id="tyIfzC107w" role="1tU5fm">
@@ -715,13 +814,12 @@
                 <node concept="37vLTw" id="72RDgIN4_KQ" role="37wK5m">
                   <ref role="3cqZAo" node="tyIfzC103X" resolve="repo" />
                 </node>
+                <node concept="37vLTw" id="2Y70AYEcmaD" role="37wK5m">
+                  <ref role="3cqZAo" node="2Y70AYEch_7" resolve="messageHandler" />
+                </node>
               </node>
             </node>
           </node>
-          <node concept="15s5l7" id="6gZak$AUFux" role="lGtFl">
-            <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;" />
-            <property role="huDt6" value="all typesystem messages" />
-          </node>
         </node>
         <node concept="3cpWs8" id="6OXbTD_oquh" role="3cqZAp">
           <node concept="3cpWsn" id="6OXbTD_oqui" role="3cpWs9">
@@ -784,6 +882,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2Y70AYEcifZ" role="3cqZAp">
+          <node concept="37vLTI" id="2Y70AYEcig1" role="3clFbG">
+            <node concept="2OqwBi" id="2Y70AYEck$$" role="37vLTJ">
+              <node concept="Xjq3P" id="2Y70AYEck_j" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2Y70AYEck$B" role="2OqNvi">
+                <ref role="2Oxat5" node="2Y70AYEcifV" resolve="messageHandler" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2Y70AYEcig5" role="37vLTx">
+              <ref role="3cqZAo" node="2Y70AYEch_7" resolve="messageHandler" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2u_o41fIE98" role="jymVt" />
@@ -2153,6 +2264,13 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="tyIfzC0ZNk" role="1B3o_S" />
+    <node concept="312cEg" id="2Y70AYEcifV" role="jymVt">
+      <property role="TrG5h" value="messageHandler" />
+      <node concept="3Tm6S6" id="2Y70AYEcifW" role="1B3o_S" />
+      <node concept="3uibUv" id="2Y70AYEcifY" role="1tU5fm">
+        <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="3evPR3EeeoU">
     <property role="TrG5h" value="TestInfoPrinter" />
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 422b9e7f..41ff96b2 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
@@ -44,6 +44,7 @@
     <import index="z9ve" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core.internal(jetbrains.mps.logic.reactor/)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
     <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -991,6 +992,56 @@
                   </node>
                 </node>
               </node>
+              <node concept="3cpWs8" id="2Y70AYEbnBU" role="3cqZAp">
+                <node concept="3cpWsn" id="2Y70AYEbnBV" role="3cpWs9">
+                  <property role="TrG5h" value="errorMsgHandler" />
+                  <node concept="3uibUv" id="2Y70AYEbnBT" role="1tU5fm">
+                    <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+                  </node>
+                  <node concept="2ShNRf" id="2Y70AYEbnBW" role="33vP2m">
+                    <node concept="YeOm9" id="2Y70AYEbnBX" role="2ShVmc">
+                      <node concept="1Y3b0j" id="2Y70AYEbnBY" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <ref role="1Y3XeK" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                        <node concept="3Tm1VV" id="2Y70AYEbnBZ" role="1B3o_S" />
+                        <node concept="3clFb_" id="2Y70AYEbnC0" role="jymVt">
+                          <property role="TrG5h" value="handle" />
+                          <node concept="3Tm1VV" id="2Y70AYEbnC1" role="1B3o_S" />
+                          <node concept="3cqZAl" id="2Y70AYEbnC2" role="3clF45" />
+                          <node concept="37vLTG" id="2Y70AYEbnC3" role="3clF46">
+                            <property role="TrG5h" value="msg" />
+                            <node concept="3uibUv" id="2Y70AYEbnC4" role="1tU5fm">
+                              <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                            </node>
+                          </node>
+                          <node concept="3clFbS" id="2Y70AYEbnC5" role="3clF47">
+                            <node concept="YS8fn" id="2Y70AYEbnC6" role="3cqZAp">
+                              <node concept="2ShNRf" id="2Y70AYEbnC7" role="YScLw">
+                                <node concept="1pGfFk" id="2Y70AYEbnC8" role="2ShVmc">
+                                  <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                                  <node concept="2OqwBi" id="2Y70AYEbnC9" role="37wK5m">
+                                    <node concept="37vLTw" id="2Y70AYEbnCa" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="2Y70AYEbnC3" resolve="msg" />
+                                    </node>
+                                    <node concept="liA8E" id="2Y70AYEbnCb" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="2Y70AYEbnCc" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="2Y70AYEbhJy" role="3cqZAp" />
               <node concept="3cpWs8" id="6OXbTD_o6iu" role="3cqZAp">
                 <node concept="3cpWsn" id="6OXbTD_o6iv" role="3cpWs9">
                   <property role="TrG5h" value="session" />
@@ -1022,6 +1073,9 @@
                       <node concept="37vLTw" id="72RDgIN4_KQ" role="37wK5m">
                         <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
                       </node>
+                      <node concept="37vLTw" id="2Y70AYEbqBu" role="37wK5m">
+                        <ref role="3cqZAo" node="2Y70AYEbnBV" resolve="errorMsgHandler" />
+                      </node>
                     </node>
                   </node>
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index c2ff9c09..d2c033a4 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -979,6 +979,16 @@
                     <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
+                <node concept="2YIFZM" id="2Y70AYEbGrb" role="37wK5m">
+                  <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                  <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                  <node concept="2OqwBi" id="2Y70AYEbGrc" role="37wK5m">
+                    <node concept="2WthIp" id="2Y70AYEbGrd" role="2Oq$k0" />
+                    <node concept="1DTwFV" id="2Y70AYEbGre" role="2OqNvi">
+                      <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -2704,6 +2714,13 @@
                           <node concept="37vLTw" id="1GKZK$AeOTe" role="37wK5m">
                             <ref role="3cqZAo" node="4vBwiiVz_W6" resolve="repository" />
                           </node>
+                          <node concept="2YIFZM" id="2Y70AYEcffs" role="37wK5m">
+                            <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                            <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                            <node concept="37vLTw" id="2Y70AYEcfPY" role="37wK5m">
+                              <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                            </node>
+                          </node>
                           <node concept="10M0yZ" id="1GKZK$AeOTf" role="37wK5m">
                             <ref role="3cqZAo" to="tj24:4t7Xo7inNvw" resolve="TYPECHECK" />
                             <ref role="1PxDUh" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
@@ -3121,6 +3138,13 @@
                     <node concept="37vLTw" id="7WKNeR8ThOi" role="37wK5m">
                       <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
                     </node>
+                    <node concept="2YIFZM" id="2Y70AYEc4aH" role="37wK5m">
+                      <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                      <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                      <node concept="37vLTw" id="2Y70AYEc4nY" role="37wK5m">
+                        <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                      </node>
+                    </node>
                     <node concept="37vLTw" id="7WKNeR9foS9" role="37wK5m">
                       <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="queryKind" />
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 0f376fed..9e739290 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -1637,26 +1637,38 @@
               <node concept="3Tqbb2" id="4MaHsBE64Yq" role="1tU5fm" />
               <node concept="2OqwBi" id="2qsG4AwK3fF" role="33vP2m">
                 <node concept="2OqwBi" id="MFuM6RlVxv" role="2Oq$k0">
-                  <node concept="2OqwBi" id="2mhJggjFiN5" role="2Oq$k0">
-                    <node concept="2OqwBi" id="2qsG4AwK3fG" role="2Oq$k0">
-                      <node concept="2YIFZM" id="2qsG4AwK3fH" role="2Oq$k0">
-                        <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                        <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
-                        <node concept="37vLTw" id="2qsG4AwK3fI" role="37wK5m">
-                          <ref role="3cqZAo" node="siuT5mmA0c" resolve="node" />
+                  <node concept="2OqwBi" id="2Y70AYEu2OT" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2mhJggjFiN5" role="2Oq$k0">
+                      <node concept="2OqwBi" id="2qsG4AwK3fG" role="2Oq$k0">
+                        <node concept="2YIFZM" id="2qsG4AwK3fH" role="2Oq$k0">
+                          <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                          <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
+                          <node concept="37vLTw" id="2qsG4AwK3fI" role="37wK5m">
+                            <ref role="3cqZAo" node="siuT5mmA0c" resolve="node" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="2qsG4AwK3fJ" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                          <node concept="37vLTw" id="2qsG4AwK3fK" role="37wK5m">
+                            <ref role="3cqZAo" node="2qsG4AwJYbT" resolve="to" />
+                          </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="2qsG4AwK3fJ" role="2OqNvi">
-                        <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                        <node concept="37vLTw" id="2qsG4AwK3fK" role="37wK5m">
-                          <ref role="3cqZAo" node="2qsG4AwJYbT" resolve="to" />
+                      <node concept="liA8E" id="2mhJggjFjW$" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportSink" />
+                        <node concept="37vLTw" id="2mhJggjFkU4" role="37wK5m">
+                          <ref role="3cqZAo" node="2mhJggjFhiq" resolve="sink" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="2mhJggjFjW$" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportSink" />
-                      <node concept="37vLTw" id="2mhJggjFkU4" role="37wK5m">
-                        <ref role="3cqZAo" node="2mhJggjFhiq" resolve="sink" />
+                    <node concept="liA8E" id="2Y70AYEu48N" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:2Y70AYEd10O" resolve="withMessageHandler" />
+                      <node concept="2YIFZM" id="2Y70AYEu64U" role="37wK5m">
+                        <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                        <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                        <node concept="37vLTw" id="2Y70AYEu70d" role="37wK5m">
+                          <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -1809,29 +1821,41 @@
               <node concept="10P_77" id="2qsG4AwKFoY" role="1tU5fm" />
               <node concept="2OqwBi" id="2qsG4AwKAu2" role="33vP2m">
                 <node concept="2OqwBi" id="MFuM6RlY9h" role="2Oq$k0">
-                  <node concept="2OqwBi" id="2mhJggjF5ea" role="2Oq$k0">
-                    <node concept="2OqwBi" id="2qsG4AwKAu3" role="2Oq$k0">
-                      <node concept="2YIFZM" id="2qsG4AwKB6p" role="2Oq$k0">
-                        <ref role="37wK5l" to="tj24:2qsG4AwIYLn" resolve="for2Node" />
-                        <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                        <node concept="37vLTw" id="2qsG4AwKBBk" role="37wK5m">
-                          <ref role="3cqZAo" node="siuT5mmA0n" resolve="type" />
+                  <node concept="2OqwBi" id="2Y70AYEu8SZ" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2mhJggjF5ea" role="2Oq$k0">
+                      <node concept="2OqwBi" id="2qsG4AwKAu3" role="2Oq$k0">
+                        <node concept="2YIFZM" id="2qsG4AwKB6p" role="2Oq$k0">
+                          <ref role="37wK5l" to="tj24:2qsG4AwIYLn" resolve="for2Node" />
+                          <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                          <node concept="37vLTw" id="2qsG4AwKBBk" role="37wK5m">
+                            <ref role="3cqZAo" node="siuT5mmA0n" resolve="type" />
+                          </node>
+                          <node concept="37vLTw" id="2qsG4AwKCh1" role="37wK5m">
+                            <ref role="3cqZAo" node="siuT5mmA0p" resolve="trgType" />
+                          </node>
                         </node>
-                        <node concept="37vLTw" id="2qsG4AwKCh1" role="37wK5m">
-                          <ref role="3cqZAo" node="siuT5mmA0p" resolve="trgType" />
+                        <node concept="liA8E" id="2qsG4AwKAu6" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                          <node concept="37vLTw" id="2qsG4AwKAu7" role="37wK5m">
+                            <ref role="3cqZAo" node="2qsG4AwKAtV" resolve="to" />
+                          </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="2qsG4AwKAu6" role="2OqNvi">
-                        <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                        <node concept="37vLTw" id="2qsG4AwKAu7" role="37wK5m">
-                          <ref role="3cqZAo" node="2qsG4AwKAtV" resolve="to" />
+                      <node concept="liA8E" id="2mhJggjF6f_" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportSink" />
+                        <node concept="37vLTw" id="2mhJggjF7i0" role="37wK5m">
+                          <ref role="3cqZAo" node="2mhJggjF3Eg" resolve="sink" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="2mhJggjF6f_" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportSink" />
-                      <node concept="37vLTw" id="2mhJggjF7i0" role="37wK5m">
-                        <ref role="3cqZAo" node="2mhJggjF3Eg" resolve="sink" />
+                    <node concept="liA8E" id="2Y70AYEu8TF" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:2Y70AYEd10O" resolve="withMessageHandler" />
+                      <node concept="2YIFZM" id="2Y70AYEu8TG" role="37wK5m">
+                        <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                        <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                        <node concept="37vLTw" id="2Y70AYEu8TH" role="37wK5m">
+                          <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -1999,29 +2023,41 @@
               <node concept="3Tqbb2" id="2qsG4AwKKKV" role="1tU5fm" />
               <node concept="2OqwBi" id="2qsG4AwKIeL" role="33vP2m">
                 <node concept="2OqwBi" id="MFuM6RlYRr" role="2Oq$k0">
-                  <node concept="2OqwBi" id="2mhJggjEVox" role="2Oq$k0">
-                    <node concept="2OqwBi" id="2qsG4AwKIeM" role="2Oq$k0">
-                      <node concept="2YIFZM" id="2qsG4AwKIRV" role="2Oq$k0">
-                        <ref role="37wK5l" to="tj24:2qsG4AwKdr0" resolve="forNodeAndConcept" />
-                        <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                        <node concept="37vLTw" id="2qsG4AwKIRW" role="37wK5m">
-                          <ref role="3cqZAo" node="siuT5mmA0$" resolve="type" />
+                  <node concept="2OqwBi" id="2Y70AYEu9YO" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2mhJggjEVox" role="2Oq$k0">
+                      <node concept="2OqwBi" id="2qsG4AwKIeM" role="2Oq$k0">
+                        <node concept="2YIFZM" id="2qsG4AwKIRV" role="2Oq$k0">
+                          <ref role="37wK5l" to="tj24:2qsG4AwKdr0" resolve="forNodeAndConcept" />
+                          <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                          <node concept="37vLTw" id="2qsG4AwKIRW" role="37wK5m">
+                            <ref role="3cqZAo" node="siuT5mmA0$" resolve="type" />
+                          </node>
+                          <node concept="37vLTw" id="2qsG4AwKJrR" role="37wK5m">
+                            <ref role="3cqZAo" node="siuT5mmA0A" resolve="trgConcept" />
+                          </node>
                         </node>
-                        <node concept="37vLTw" id="2qsG4AwKJrR" role="37wK5m">
-                          <ref role="3cqZAo" node="siuT5mmA0A" resolve="trgConcept" />
+                        <node concept="liA8E" id="2qsG4AwKIeQ" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                          <node concept="37vLTw" id="2qsG4AwKIeR" role="37wK5m">
+                            <ref role="3cqZAo" node="2qsG4AwKIeE" resolve="to" />
+                          </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="2qsG4AwKIeQ" role="2OqNvi">
-                        <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                        <node concept="37vLTw" id="2qsG4AwKIeR" role="37wK5m">
-                          <ref role="3cqZAo" node="2qsG4AwKIeE" resolve="to" />
+                      <node concept="liA8E" id="2mhJggjEWnO" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportSink" />
+                        <node concept="37vLTw" id="2mhJggjEXhQ" role="37wK5m">
+                          <ref role="3cqZAo" node="2mhJggjES5t" resolve="sink" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="2mhJggjEWnO" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportSink" />
-                      <node concept="37vLTw" id="2mhJggjEXhQ" role="37wK5m">
-                        <ref role="3cqZAo" node="2mhJggjES5t" resolve="sink" />
+                    <node concept="liA8E" id="2Y70AYEuaye" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:2Y70AYEd10O" resolve="withMessageHandler" />
+                      <node concept="2YIFZM" id="2Y70AYEuayf" role="37wK5m">
+                        <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                        <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                        <node concept="37vLTw" id="2Y70AYEuayg" role="37wK5m">
+                          <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -2325,34 +2361,46 @@
           </node>
           <node concept="3clFbF" id="2qsG4AwKYP$" role="3cqZAp">
             <node concept="2OqwBi" id="2qsG4AwKZwC" role="3clFbG">
-              <node concept="2OqwBi" id="2qsG4AwL2gk" role="2Oq$k0">
-                <node concept="2OqwBi" id="MFuM6RlZUf" role="2Oq$k0">
-                  <node concept="2OqwBi" id="2qsG4AwL2gl" role="2Oq$k0">
-                    <node concept="2YIFZM" id="2qsG4AwL2gm" role="2Oq$k0">
-                      <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
-                      <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                      <node concept="37vLTw" id="2qsG4AwL2gn" role="37wK5m">
-                        <ref role="3cqZAo" node="2Hyoxv0bBG" resolve="node" />
+              <node concept="2OqwBi" id="2Y70AYEubqO" role="2Oq$k0">
+                <node concept="2OqwBi" id="2qsG4AwL2gk" role="2Oq$k0">
+                  <node concept="2OqwBi" id="MFuM6RlZUf" role="2Oq$k0">
+                    <node concept="2OqwBi" id="2qsG4AwL2gl" role="2Oq$k0">
+                      <node concept="2YIFZM" id="2qsG4AwL2gm" role="2Oq$k0">
+                        <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
+                        <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                        <node concept="37vLTw" id="2qsG4AwL2gn" role="37wK5m">
+                          <ref role="3cqZAo" node="2Hyoxv0bBG" resolve="node" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="2qsG4AwL2go" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                        <node concept="37vLTw" id="2qsG4AwL2gp" role="37wK5m">
+                          <ref role="3cqZAo" node="2qsG4AwKPDy" resolve="to" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="2qsG4AwL2go" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                      <node concept="37vLTw" id="2qsG4AwL2gp" role="37wK5m">
-                        <ref role="3cqZAo" node="2qsG4AwKPDy" resolve="to" />
+                    <node concept="liA8E" id="MFuM6RlZUF" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withOptions" />
+                      <node concept="1rXfSq" id="MFuM6RlZUG" role="37wK5m">
+                        <ref role="37wK5l" node="MFuM6RlFvN" resolve="options" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="MFuM6RlZUF" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withOptions" />
-                    <node concept="1rXfSq" id="MFuM6RlZUG" role="37wK5m">
-                      <ref role="37wK5l" node="MFuM6RlFvN" resolve="options" />
+                  <node concept="liA8E" id="2qsG4AwL2gq" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportSink" />
+                    <node concept="37vLTw" id="2qsG4AwL2gr" role="37wK5m">
+                      <ref role="3cqZAo" node="2mhJggjEIHJ" resolve="sink" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="2qsG4AwL2gq" role="2OqNvi">
-                  <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportSink" />
-                  <node concept="37vLTw" id="2qsG4AwL2gr" role="37wK5m">
-                    <ref role="3cqZAo" node="2mhJggjEIHJ" resolve="sink" />
+                <node concept="liA8E" id="2Y70AYEubYl" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:2Y70AYEd10O" resolve="withMessageHandler" />
+                  <node concept="2YIFZM" id="2Y70AYEubYm" role="37wK5m">
+                    <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                    <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                    <node concept="37vLTw" id="2Y70AYEubYn" role="37wK5m">
+                      <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
+                    </node>
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 0b0195e3..809c4c24 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -56,6 +56,7 @@
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -5387,34 +5388,6 @@
         <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
       </node>
       <node concept="3clFbS" id="5KrJ7UHN1Lo" role="3clF47">
-        <node concept="3SKdUt" id="5KrJ7UHN4OP" role="3cqZAp">
-          <node concept="1PaTwC" id="589APehYyiN" role="3ndbpf">
-            <node concept="3oM_SD" id="589APehYyiO" role="1PaTwD">
-              <property role="3oM_SC" value="FIXME" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiP" role="1PaTwD">
-              <property role="3oM_SC" value="check" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiQ" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiR" role="1PaTwD">
-              <property role="3oM_SC" value="reporter" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiS" role="1PaTwD">
-              <property role="3oM_SC" value="hasn't" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiT" role="1PaTwD">
-              <property role="3oM_SC" value="been" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiU" role="1PaTwD">
-              <property role="3oM_SC" value="set" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiV" role="1PaTwD">
-              <property role="3oM_SC" value="already" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="5KrJ7UHN48u" role="3cqZAp">
           <node concept="37vLTI" id="5KrJ7UHN4_M" role="3clFbG">
             <node concept="37vLTw" id="5KrJ7UHN4EN" role="37vLTx">
@@ -5435,6 +5408,38 @@
       <node concept="3Tm1VV" id="2qsG4AwGcLI" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="1G9Y_QvbsSD" role="jymVt" />
+    <node concept="3clFb_" id="2Y70AYEd10O" role="jymVt">
+      <property role="TrG5h" value="withMessageHandler" />
+      <node concept="37vLTG" id="2Y70AYEdyxn" role="3clF46">
+        <property role="TrG5h" value="messageHandler" />
+        <node concept="3uibUv" id="2Y70AYEdBjI" role="1tU5fm">
+          <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="2Y70AYEdkXM" role="3clF45">
+        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+      </node>
+      <node concept="3Tm1VV" id="2Y70AYEd10R" role="1B3o_S" />
+      <node concept="3clFbS" id="2Y70AYEd10S" role="3clF47">
+        <node concept="3clFbF" id="2Y70AYEdD1e" role="3cqZAp">
+          <node concept="37vLTI" id="2Y70AYEdD1g" role="3clFbG">
+            <node concept="2OqwBi" id="2Y70AYEdHrp" role="37vLTJ">
+              <node concept="Xjq3P" id="2Y70AYEdHxn" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2Y70AYEdHrs" role="2OqNvi">
+                <ref role="2Oxat5" node="2Y70AYEdD1a" resolve="messageHandler" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2Y70AYEdD1k" role="37vLTx">
+              <ref role="3cqZAo" node="2Y70AYEdyxn" resolve="messageHandler" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2Y70AYEdIKK" role="3cqZAp">
+          <node concept="Xjq3P" id="2Y70AYEdIKI" role="3clFbG" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2Y70AYEcVm4" role="jymVt" />
     <node concept="3clFb_" id="1G9Y_Qvby8B" role="jymVt">
       <property role="TrG5h" value="withTraceObject" />
       <node concept="37vLTG" id="1G9Y_QvckK$" role="3clF46">
@@ -6750,6 +6755,9 @@
                     <node concept="37vLTw" id="1FOQehxnBes" role="37wK5m">
                       <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
                     </node>
+                    <node concept="37vLTw" id="2Y70AYEdJPc" role="37wK5m">
+                      <ref role="3cqZAo" node="2Y70AYEdD1a" resolve="messageHandler" />
+                    </node>
                     <node concept="37vLTw" id="1FOQehxnBer" role="37wK5m">
                       <ref role="3cqZAo" node="1FOQehxnBeo" resolve="queryKind" />
                     </node>
@@ -6941,6 +6949,9 @@
                     <node concept="37vLTw" id="3KN3A4vEXnM" role="37wK5m">
                       <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
                     </node>
+                    <node concept="37vLTw" id="2Y70AYEdLut" role="37wK5m">
+                      <ref role="3cqZAo" node="2Y70AYEdD1a" resolve="messageHandler" />
+                    </node>
                     <node concept="37vLTw" id="3KN3A4vEXnN" role="37wK5m">
                       <ref role="3cqZAo" node="3KN3A4vEXnq" resolve="queryKind" />
                     </node>
@@ -7332,6 +7343,13 @@
         <ref role="3uigEE" to="1yqb:MFuM6QJLE2" resolve="Step.Options" />
       </node>
     </node>
+    <node concept="312cEg" id="2Y70AYEdD1a" role="jymVt">
+      <property role="TrG5h" value="messageHandler" />
+      <node concept="3Tm6S6" id="2Y70AYEdD1b" role="1B3o_S" />
+      <node concept="3uibUv" id="2Y70AYEdD1d" role="1tU5fm">
+        <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="4t7Xo7inNgi">
     <property role="TrG5h" value="TypecheckingQueryKind" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index f7b29874..248c9d32 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -674,6 +674,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="7kTeLbPt5$7" role="3cqZAp">
+          <node concept="37vLTI" id="7kTeLbPt5$9" role="3clFbG">
+            <node concept="2OqwBi" id="7kTeLbPt6tX" role="37vLTJ">
+              <node concept="Xjq3P" id="7kTeLbPt6yw" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7kTeLbPt6u0" role="2OqNvi">
+                <ref role="2Oxat5" node="7kTeLbPt5$3" resolve="nodes" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7kTeLbPt5$d" role="37vLTx">
+              <ref role="3cqZAo" node="7kTeLbPt4nq" resolve="inputNodes" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="7kTeLbPt4nk" role="3cqZAp">
           <node concept="37vLTI" id="7kTeLbPt4nl" role="3clFbG">
             <node concept="2OqwBi" id="7kTeLbPt4nm" role="37vLTJ">
@@ -687,16 +700,16 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7kTeLbPt5$7" role="3cqZAp">
-          <node concept="37vLTI" id="7kTeLbPt5$9" role="3clFbG">
-            <node concept="2OqwBi" id="7kTeLbPt6tX" role="37vLTJ">
-              <node concept="Xjq3P" id="7kTeLbPt6yw" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7kTeLbPt6u0" role="2OqNvi">
-                <ref role="2Oxat5" node="7kTeLbPt5$3" resolve="nodes" />
+        <node concept="3clFbF" id="2Y70AYEbIyc" role="3cqZAp">
+          <node concept="37vLTI" id="2Y70AYEbIye" role="3clFbG">
+            <node concept="2OqwBi" id="2Y70AYEbKAH" role="37vLTJ">
+              <node concept="Xjq3P" id="2Y70AYEbKFu" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2Y70AYEbKAK" role="2OqNvi">
+                <ref role="2Oxat5" node="2Y70AYEbIy8" resolve="messageHandler" />
               </node>
             </node>
-            <node concept="37vLTw" id="7kTeLbPt5$d" role="37vLTx">
-              <ref role="3cqZAo" node="7kTeLbPt4nq" resolve="inputNodes" />
+            <node concept="37vLTw" id="2Y70AYEbIyi" role="37vLTx">
+              <ref role="3cqZAo" node="2Y70AYEbHFt" resolve="messageHandler" />
             </node>
           </node>
         </node>
@@ -720,6 +733,12 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
+      <node concept="37vLTG" id="2Y70AYEbHFt" role="3clF46">
+        <property role="TrG5h" value="messageHandler" />
+        <node concept="3uibUv" id="2Y70AYEbI0M" role="1tU5fm">
+          <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7kTeLbPt4n9" role="jymVt" />
     <node concept="3clFbW" id="7WKNeR9fh8j" role="jymVt">
@@ -756,19 +775,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7WKNeR9fkhk" role="3cqZAp">
-          <node concept="37vLTI" id="7WKNeR9fkhl" role="3clFbG">
-            <node concept="2OqwBi" id="7WKNeR9fkhm" role="37vLTJ">
-              <node concept="Xjq3P" id="7WKNeR9fkhn" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7WKNeR9fkho" role="2OqNvi">
-                <ref role="2Oxat5" node="7WKNeR9fj4f" resolve="queryKind" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7WKNeR9fkhp" role="37vLTx">
-              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryKind" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="7WKNeR9fh8t" role="3cqZAp">
           <node concept="37vLTI" id="7WKNeR9fh8u" role="3clFbG">
             <node concept="2OqwBi" id="7WKNeR9fh8v" role="37vLTJ">
@@ -795,6 +801,32 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2Y70AYEbLoH" role="3cqZAp">
+          <node concept="37vLTI" id="2Y70AYEbMxo" role="3clFbG">
+            <node concept="37vLTw" id="2Y70AYEbML6" role="37vLTx">
+              <ref role="3cqZAo" node="2Y70AYEbI3K" resolve="messageHandler" />
+            </node>
+            <node concept="2OqwBi" id="2Y70AYEbLRC" role="37vLTJ">
+              <node concept="Xjq3P" id="2Y70AYEbLoF" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2Y70AYEbMe6" role="2OqNvi">
+                <ref role="2Oxat5" node="2Y70AYEbIy8" resolve="messageHandler" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR9fkhk" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9fkhl" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9fkhm" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9fkhn" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9fkho" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR9fj4f" resolve="queryKind" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9fkhp" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryKind" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6OXbTDxIg05" role="3cqZAp">
           <node concept="37vLTI" id="6OXbTDxIg07" role="3clFbG">
             <node concept="2OqwBi" id="6OXbTDxIh3L" role="37vLTJ">
@@ -828,6 +860,12 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
+      <node concept="37vLTG" id="2Y70AYEbI3K" role="3clF46">
+        <property role="TrG5h" value="messageHandler" />
+        <node concept="3uibUv" id="2Y70AYEbIp4" role="1tU5fm">
+          <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+        </node>
+      </node>
       <node concept="37vLTG" id="7WKNeR9fiNv" role="3clF46">
         <property role="TrG5h" value="queryKind" />
         <node concept="3uibUv" id="NKt6yn7sOZ" role="1tU5fm">
@@ -1051,6 +1089,9 @@
                                 <node concept="37vLTw" id="72RDgIN3WaB" role="37wK5m">
                                   <ref role="3cqZAo" node="6kREIVkLEGt" resolve="repository" />
                                 </node>
+                                <node concept="37vLTw" id="2Y70AYEcIUh" role="37wK5m">
+                                  <ref role="3cqZAo" node="2Y70AYEbIy8" resolve="messageHandler" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -1320,6 +1361,13 @@
         <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
       </node>
     </node>
+    <node concept="312cEg" id="2Y70AYEbIy8" role="jymVt">
+      <property role="TrG5h" value="messageHandler" />
+      <node concept="3Tm6S6" id="2Y70AYEbIy9" role="1B3o_S" />
+      <node concept="3uibUv" id="2Y70AYEbIyb" role="1tU5fm">
+        <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="1pPth$lAzAx">
     <property role="2bfB8j" value="false" />
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index 5ab46ee7..6b751c42 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -924,6 +924,13 @@
                     <node concept="37vLTw" id="7WKNeR8ThOi" role="37wK5m">
                       <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
                     </node>
+                    <node concept="2YIFZM" id="2Y70AYEc1s7" role="37wK5m">
+                      <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                      <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                      <node concept="37vLTw" id="2Y70AYEc1Yz" role="37wK5m">
+                        <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                      </node>
+                    </node>
                     <node concept="37vLTw" id="7WKNeR9foS9" role="37wK5m">
                       <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="queryKind" />
                     </node>