diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30463c3cd3..9aeb4a93a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
- A null pointer was fixed that was related to showing the documentation when the documentation tab is not opened.
- The documentation Tool is now only updated when the selection changed.
+- com.mbeddr.mpsutil.compare: the diff preview feature now also works in external classes and not only test cases.
## com.mbeddr.mpsutil
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
index 4a9aca6005..88ef2499cb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
@@ -20,10 +20,12 @@
+
+
+
-
@@ -115,6 +117,9 @@
+
+
+
@@ -529,7 +534,7 @@
-
+
@@ -905,7 +910,7 @@
-
+
@@ -925,6 +930,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -992,11 +1022,8 @@
-
-
-
-
-
+
+
@@ -1061,11 +1088,8 @@
-
-
-
-
-
+
+
@@ -1138,11 +1162,8 @@
-
-
-
-
-
+
+
@@ -1234,6 +1255,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1277,11 +1323,8 @@
-
-
-
-
-
+
+
@@ -1368,11 +1411,8 @@
-
-
-
-
-
+
+
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
index 853627e317..ff421494ef 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
@@ -12,6 +12,7 @@
+
@@ -69,6 +70,7 @@
+
@@ -728,6 +730,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -927,5 +964,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+