diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77e09dfe6e..3a34590b1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
 - *de.slisson.mps.tables* Textgen warning about duplicate unit name when an editor model contains multiple tables without an action map. 
 - *de.itemis.mps.editor.pagination* A NullPointerException was fixed for cases where the clicked node was null.
 - *de.itemis.mps.spellcheck* Custom dictionaries are not saved in the .mps/dictionaries/project.xml files anymore and pollute the file that is normally used for words saved manually by the user.
+- *de.itemis.mps.editor.celllayout* Reloading all classes do not lead to ClassCastExceptions anymore.
 
 ### Added
 
diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps
index 146c956b1a..377cb04c2e 100644
--- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps
+++ b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps
@@ -501,7 +501,7 @@
                           <node concept="3clFbF" id="2hEgJWExc8_" role="3cqZAp">
                             <node concept="2OqwBi" id="2hEgJWExchV" role="3clFbG">
                               <node concept="liA8E" id="2hEgJWExe5w" role="2OqNvi">
-                                <ref role="37wK5l" to="exr9:~EditorComponent.relayout()" resolve="relayout" />
+                                <ref role="37wK5l" to="exr9:~EditorComponent.update()" resolve="update" />
                               </node>
                               <node concept="37vLTw" id="2hEgJWExc8z" role="2Oq$k0">
                                 <ref role="3cqZAo" node="DrREDhpexS" resolve="editorComponent" />
diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
index ec7c93e45c..7a45acbb1a 100644
--- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
+++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
@@ -2613,6 +2613,14 @@
                     <ref role="37wK5l" to="bd8o:~Application.invokeAndWait(java.lang.Runnable)" resolve="invokeAndWait" />
                     <node concept="1bVj0M" id="4hHbxs9xH_k" role="37wK5m">
                       <node concept="3clFbS" id="4hHbxs9xH_l" role="1bW5cS">
+                        <node concept="3clFbJ" id="2silbc$qQ_q" role="3cqZAp">
+                          <node concept="3clFbS" id="2silbc$qQ_s" role="3clFbx">
+                            <node concept="3cpWs6" id="2silbc$qUUV" role="3cqZAp" />
+                          </node>
+                          <node concept="37vLTw" id="2silbc$qS5R" role="3clFbw">
+                            <ref role="3cqZAo" node="4hHbxs9xqXW" resolve="myStopRequested" />
+                          </node>
+                        </node>
                         <node concept="3clFbF" id="4hHbxs9xH_m" role="3cqZAp">
                           <node concept="2OqwBi" id="4hHbxs9z7KJ" role="3clFbG">
                             <node concept="2OqwBi" id="4hHbxs9z6Q9" role="2Oq$k0">
@@ -2668,12 +2676,17 @@
                 </node>
               </node>
               <node concept="3clFbJ" id="4hHbxs9xqYO" role="3cqZAp">
-                <node concept="AH0OO" id="4hHbxs9xqYP" role="3clFbw">
-                  <node concept="37vLTw" id="4hHbxs9xqYQ" role="AHHXb">
-                    <ref role="3cqZAo" node="4hHbxs9xqYq" resolve="forceReturn" />
+                <node concept="22lmx$" id="2silbc$qWE9" role="3clFbw">
+                  <node concept="37vLTw" id="2silbc$qY9V" role="3uHU7w">
+                    <ref role="3cqZAo" node="4hHbxs9xqXW" resolve="myStopRequested" />
                   </node>
-                  <node concept="3cmrfG" id="4hHbxs9xqYR" role="AHEQo">
-                    <property role="3cmrfH" value="0" />
+                  <node concept="AH0OO" id="4hHbxs9xqYP" role="3uHU7B">
+                    <node concept="37vLTw" id="4hHbxs9xqYQ" role="AHHXb">
+                      <ref role="3cqZAo" node="4hHbxs9xqYq" resolve="forceReturn" />
+                    </node>
+                    <node concept="3cmrfG" id="4hHbxs9xqYR" role="AHEQo">
+                      <property role="3cmrfH" value="0" />
+                    </node>
                   </node>
                 </node>
                 <node concept="3clFbS" id="4hHbxs9xqYT" role="3clFbx">
diff --git a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
index 3fe59f5675..8320f7d55e 100644
--- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
+++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
@@ -536,6 +536,44 @@
             <property role="3oM_SC" value="user." />
           </node>
         </node>
+        <node concept="2DRihI" id="4EvAOIwpQ_U" role="15bAlk">
+          <property role="2RT3bR" value="0" />
+          <node concept="15Ami3" id="4EvAOIwpQCD" role="1PaTwD">
+            <node concept="37shsh" id="4EvAOIwpQCF" role="15Aodc">
+              <node concept="1dCxOk" id="4EvAOIwpQE5" role="37shsm">
+                <property role="1XweGW" value="1919c723-b60b-4592-9318-9ce96d91da44" />
+                <property role="1XxBO9" value="de.itemis.mps.editor.celllayout" />
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="4EvAOIwpQEZ" role="1PaTwD">
+            <property role="3oM_SC" value="Reloading" />
+          </node>
+          <node concept="3oM_SD" id="4EvAOIwpQFn" role="1PaTwD">
+            <property role="3oM_SC" value="all" />
+          </node>
+          <node concept="3oM_SD" id="4EvAOIwpQFo" role="1PaTwD">
+            <property role="3oM_SC" value="classes" />
+          </node>
+          <node concept="3oM_SD" id="4EvAOIwpQFZ" role="1PaTwD">
+            <property role="3oM_SC" value="do" />
+          </node>
+          <node concept="3oM_SD" id="4EvAOIwpQLR" role="1PaTwD">
+            <property role="3oM_SC" value="not" />
+          </node>
+          <node concept="3oM_SD" id="4EvAOIwpQMf" role="1PaTwD">
+            <property role="3oM_SC" value="lead" />
+          </node>
+          <node concept="3oM_SD" id="4EvAOIwpQMv" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="4EvAOIwpQN6" role="1PaTwD">
+            <property role="3oM_SC" value="ClassCastExceptions" />
+          </node>
+          <node concept="3oM_SD" id="4EvAOIwpQNP" role="1PaTwD">
+            <property role="3oM_SC" value="anymore." />
+          </node>
+        </node>
       </node>
       <node concept="15bAme" id="7sG71xKEOFT" role="15bAlL">
         <property role="15bAli" value="Po4Z58tnOE/added" />