diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
index 48e0ade5..a28aef63 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
@@ -5488,7 +5488,7 @@
-
+
@@ -5537,7 +5537,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/generator/templates/jetbrains.mps.baseLanguage.kotlinRefsExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/generator/templates/jetbrains.mps.baseLanguage.kotlinRefsExt.generator.templates@generator.mps
index d8da25ec..d11d0934 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/generator/templates/jetbrains.mps.baseLanguage.kotlinRefsExt.generator.templates@generator.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/generator/templates/jetbrains.mps.baseLanguage.kotlinRefsExt.generator.templates@generator.mps
@@ -12,7 +12,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
index 8b5aaae3..098a5114 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
@@ -6,7 +6,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
@@ -27,7 +27,7 @@
-
+
@@ -51,7 +51,6 @@
-
@@ -63,7 +62,6 @@
-
6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)
2405a196-e75d-462c-938b-ae8e3fac20aa(jetbrains.mps.baseLanguage.kotlinRefs)
@@ -73,7 +71,7 @@
-
+
@@ -83,7 +81,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/generator/templates/jetbrains.mps.lang.extensionExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/generator/templates/jetbrains.mps.lang.extensionExt.generator.templates@generator.mps
index e4958232..c44f512b 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/generator/templates/jetbrains.mps.lang.extensionExt.generator.templates@generator.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/generator/templates/jetbrains.mps.lang.extensionExt.generator.templates@generator.mps
@@ -12,7 +12,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/jetbrains.mps.lang.extensionExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/jetbrains.mps.lang.extensionExt.mpl
index 2270f6af..b3a8e770 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/jetbrains.mps.lang.extensionExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/jetbrains.mps.lang.extensionExt.mpl
@@ -6,7 +6,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
@@ -27,7 +27,7 @@
-
+
@@ -48,7 +48,6 @@
-
@@ -63,7 +62,6 @@
-
88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)
@@ -71,7 +69,7 @@
-
+
@@ -80,7 +78,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/generator/templates/jetbrains.mps.lang.sharedConceptsExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/generator/templates/jetbrains.mps.lang.sharedConceptsExt.generator.templates@generator.mps
index 41057e22..46f26332 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/generator/templates/jetbrains.mps.lang.sharedConceptsExt.generator.templates@generator.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/generator/templates/jetbrains.mps.lang.sharedConceptsExt.generator.templates@generator.mps
@@ -12,7 +12,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/jetbrains.mps.lang.sharedConceptsExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/jetbrains.mps.lang.sharedConceptsExt.mpl
index 0ab78cc3..9ff670a1 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/jetbrains.mps.lang.sharedConceptsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/jetbrains.mps.lang.sharedConceptsExt.mpl
@@ -6,7 +6,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
@@ -27,7 +27,7 @@
-
+
@@ -48,7 +48,6 @@
-
@@ -63,12 +62,11 @@
-
-
+
@@ -77,7 +75,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/models/jetbrains.mps.lang.sharedConceptsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/models/jetbrains.mps.lang.sharedConceptsExt.types.mps
index 324f2074..1e3cc3cc 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/models/jetbrains.mps.lang.sharedConceptsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/models/jetbrains.mps.lang.sharedConceptsExt.types.mps
@@ -24,7 +24,7 @@
-
+