diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 9144ddd53f..2f34093d56 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -30,11 +30,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v5
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
         cache: gradle
     - name: Install C++ build tools
       run: sudo apt-get update && sudo apt-get install -y g++ make xvfb
diff --git a/.github/workflows/publish-maven.yml b/.github/workflows/publish-maven.yml
index d5c6718ac2..48ad1e8419 100644
--- a/.github/workflows/publish-maven.yml
+++ b/.github/workflows/publish-maven.yml
@@ -20,11 +20,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v5
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
     - name: Install C++ build tools
       run: sudo apt-get update && sudo apt-get install -y g++ make xvfb
     - name: Grant execute permission for gradlew
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f68b8dabe2..3166f45820 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,11 +16,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v5
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
     - name: Install C++ build tools
       run: sudo apt-get update && sudo apt-get install -y g++ make xvfb
     - name: Grant execute permission for gradlew
diff --git a/.mps/migration.xml b/.mps/migration.xml
index 5524d8e35b..3cc82db888 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -12,6 +12,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
-    <entry key="project.migrated.version" value="241" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2024_3.LangResourceImport4Migration" value="executed" />
+    <entry key="project.migrated.version" value="251" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 38467ba33c..084ab867c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ plugins {
 }
 
 downloadJbr {
-    jbrVersion = '17.0.11-b1207.30'
+    jbrVersion = '21.0.6-b895.109'
 }
 
 def incrementalBuild = !project.hasProperty("disableIncrementalBuild")
@@ -41,9 +41,9 @@ configurations {
 }
 
 dependencies {
-    mps "com.jetbrains:mps:2024.1.+"
-    languageLibs "com.mbeddr:mbeddr:2024.1.+"
-    languageLibs "de.itemis.mps:extensions:2024.1.+"
+    mps "com.jetbrains:mps:2025.1.+"
+    languageLibs "com.mbeddr:mbeddr:2025.1.+"
+    languageLibs "de.itemis.mps:extensions:2025.1.+"
     junitAnt 'org.apache.ant:ant-junit:1.10.17'
 }
 
diff --git a/gradle.properties b/gradle.properties
index 1f367ff87f..332af77402 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-mbeddrCppVersion = 2024.1
+mbeddrCppVersion = 2025.1
 systemProp.org.gradle.internal.http.connectionTimeout=180000
 systemProp.org.gradle.internal.http.socketTimeout=180000
diff --git a/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl b/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
index 8c17420c76..899f4e68a5 100644
--- a/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
+++ b/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.cpp.base" uuid="8c081446-e4ba-48b7-a7e0-3db40e2c3439" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -53,7 +53,7 @@
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:97a52717-898f-4598-8150-573d9fd03868:jetbrains.mps.lang.dataFlow.analyzers" version="0" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
@@ -62,7 +62,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps
index d5f3488c3b..7a796994aa 100644
--- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps
+++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:a6defc8b-c4d9-46c9-a221-6d68fa6905e1(com.mbeddr.cpp.base.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/languages/com.mbeddr.cpp.buildconfig/com.mbeddr.cpp.buildconfig.mpl b/languages/com.mbeddr.cpp.buildconfig/com.mbeddr.cpp.buildconfig.mpl
index a524b3c28f..cc621675cd 100644
--- a/languages/com.mbeddr.cpp.buildconfig/com.mbeddr.cpp.buildconfig.mpl
+++ b/languages/com.mbeddr.cpp.buildconfig/com.mbeddr.cpp.buildconfig.mpl
@@ -148,7 +148,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
@@ -157,7 +157,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/languages/com.mbeddr.cpp.buildconfig/models/editor.mps b/languages/com.mbeddr.cpp.buildconfig/models/editor.mps
index 74f8b59f78..6ebac56020 100644
--- a/languages/com.mbeddr.cpp.buildconfig/models/editor.mps
+++ b/languages/com.mbeddr.cpp.buildconfig/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:470474b9-0ab0-4de6-bc18-34fc04d4c8bd(com.mbeddr.cpp.buildconfig.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports />
diff --git a/languages/com.mbeddr.cpp.exceptions/com.mbeddr.cpp.exceptions.mpl b/languages/com.mbeddr.cpp.exceptions/com.mbeddr.cpp.exceptions.mpl
index d6ad486301..f9901cbc79 100644
--- a/languages/com.mbeddr.cpp.exceptions/com.mbeddr.cpp.exceptions.mpl
+++ b/languages/com.mbeddr.cpp.exceptions/com.mbeddr.cpp.exceptions.mpl
@@ -38,12 +38,12 @@
     <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/languages/com.mbeddr.cpp.exceptions/models/editor.mps b/languages/com.mbeddr.cpp.exceptions/models/editor.mps
index c6b8aad008..77d89b1f79 100644
--- a/languages/com.mbeddr.cpp.exceptions/models/editor.mps
+++ b/languages/com.mbeddr.cpp.exceptions/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:2c7fe9e9-a5c4-45c8-9618-d3864c4dd4d5(com.mbeddr.cpp.exceptions.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/languages/com.mbeddr.cpp.expressions/com.mbeddr.cpp.expressions.mpl b/languages/com.mbeddr.cpp.expressions/com.mbeddr.cpp.expressions.mpl
index 20f656c996..c3a3286ab6 100644
--- a/languages/com.mbeddr.cpp.expressions/com.mbeddr.cpp.expressions.mpl
+++ b/languages/com.mbeddr.cpp.expressions/com.mbeddr.cpp.expressions.mpl
@@ -48,7 +48,7 @@
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:97a52717-898f-4598-8150-573d9fd03868:jetbrains.mps.lang.dataFlow.analyzers" version="0" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
@@ -57,7 +57,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/languages/com.mbeddr.cpp.expressions/models/editor.mps b/languages/com.mbeddr.cpp.expressions/models/editor.mps
index a6143807a7..3b4ff609d6 100644
--- a/languages/com.mbeddr.cpp.expressions/models/editor.mps
+++ b/languages/com.mbeddr.cpp.expressions/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:ebec74e0-7baf-4d81-9d69-eed86132a515(com.mbeddr.cpp.expressions.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
diff --git a/languages/com.mbeddr.cpp.modules.gen/com.mbeddr.cpp.modules.gen.mpl b/languages/com.mbeddr.cpp.modules.gen/com.mbeddr.cpp.modules.gen.mpl
index 9f2cee566a..c9ee51b888 100644
--- a/languages/com.mbeddr.cpp.modules.gen/com.mbeddr.cpp.modules.gen.mpl
+++ b/languages/com.mbeddr.cpp.modules.gen/com.mbeddr.cpp.modules.gen.mpl
@@ -163,7 +163,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
     <language slang="l:b1ab8c10-c118-4755-bf2a-cebab35cf533:jetbrains.mps.lang.editor.tooltips" version="0" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
@@ -173,7 +173,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/languages/com.mbeddr.cpp.modules.gen/models/editor.mps b/languages/com.mbeddr.cpp.modules.gen/models/editor.mps
index 7491088707..073cc3bbbf 100644
--- a/languages/com.mbeddr.cpp.modules.gen/models/editor.mps
+++ b/languages/com.mbeddr.cpp.modules.gen/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:00ad4221-5ace-4191-9eff-771e6580df32(com.mbeddr.cpp.modules.gen.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <use id="b1ab8c10-c118-4755-bf2a-cebab35cf533" name="jetbrains.mps.lang.editor.tooltips" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/languages/com.mbeddr.cpp.modules/com.mbeddr.cpp.modules.mpl b/languages/com.mbeddr.cpp.modules/com.mbeddr.cpp.modules.mpl
index 8ba0faf678..0b067c2b53 100644
--- a/languages/com.mbeddr.cpp.modules/com.mbeddr.cpp.modules.mpl
+++ b/languages/com.mbeddr.cpp.modules/com.mbeddr.cpp.modules.mpl
@@ -43,7 +43,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
@@ -52,7 +52,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/languages/com.mbeddr.cpp.modules/models/editor.mps b/languages/com.mbeddr.cpp.modules/models/editor.mps
index 9a25aea14c..77e6f52470 100644
--- a/languages/com.mbeddr.cpp.modules/models/editor.mps
+++ b/languages/com.mbeddr.cpp.modules/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:304e0796-c31d-4fe5-9ed1-191e29551445(com.mbeddr.cpp.modules.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports />
diff --git a/languages/com.mbeddr.cpp.modules/models/structure.mps b/languages/com.mbeddr.cpp.modules/models/structure.mps
index df1a8d7458..96cdab6634 100644
--- a/languages/com.mbeddr.cpp.modules/models/structure.mps
+++ b/languages/com.mbeddr.cpp.modules/models/structure.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="3" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
diff --git a/languages/com.mbeddr.cpp.operator_overload/com.mbeddr.cpp.operator_overload.mpl b/languages/com.mbeddr.cpp.operator_overload/com.mbeddr.cpp.operator_overload.mpl
index 97a317e36d..6f89e78ec9 100644
--- a/languages/com.mbeddr.cpp.operator_overload/com.mbeddr.cpp.operator_overload.mpl
+++ b/languages/com.mbeddr.cpp.operator_overload/com.mbeddr.cpp.operator_overload.mpl
@@ -45,11 +45,11 @@
     <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/languages/com.mbeddr.cpp.operator_overload/models/editor.mps b/languages/com.mbeddr.cpp.operator_overload/models/editor.mps
index b108980cec..85c16cbe4e 100644
--- a/languages/com.mbeddr.cpp.operator_overload/models/editor.mps
+++ b/languages/com.mbeddr.cpp.operator_overload/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:a32f7298-cad3-40f3-abb1-51391e1cf46a(com.mbeddr.cpp.operator_overload.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/languages/com.mbeddr.cpp.templates/com.mbeddr.cpp.templates.mpl b/languages/com.mbeddr.cpp.templates/com.mbeddr.cpp.templates.mpl
index 45aabd21d4..eac68e24a7 100644
--- a/languages/com.mbeddr.cpp.templates/com.mbeddr.cpp.templates.mpl
+++ b/languages/com.mbeddr.cpp.templates/com.mbeddr.cpp.templates.mpl
@@ -46,12 +46,12 @@
     <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/languages/com.mbeddr.cpp.templates/models/editor.mps b/languages/com.mbeddr.cpp.templates/models/editor.mps
index 992bac7478..3d3641e019 100644
--- a/languages/com.mbeddr.cpp.templates/models/editor.mps
+++ b/languages/com.mbeddr.cpp.templates/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:03f42ed3-a7ab-425a-a08f-a42876025a0b(com.mbeddr.cpp.templates.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/languages/com.mbeddr.cpp.templates/models/intentions.mps b/languages/com.mbeddr.cpp.templates/models/intentions.mps
index 1dcbbf51bb..fa37ef9e56 100644
--- a/languages/com.mbeddr.cpp.templates/models/intentions.mps
+++ b/languages/com.mbeddr.cpp.templates/models/intentions.mps
@@ -5,7 +5,7 @@
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="1" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/solutions/com.mbeddr.cpp.ex-tests.build/com.mbeddr.cpp.ex-tests.build.msd b/solutions/com.mbeddr.cpp.ex-tests.build/com.mbeddr.cpp.ex-tests.build.msd
index 843da4f756..05cb0df162 100644
--- a/solutions/com.mbeddr.cpp.ex-tests.build/com.mbeddr.cpp.ex-tests.build.msd
+++ b/solutions/com.mbeddr.cpp.ex-tests.build/com.mbeddr.cpp.ex-tests.build.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="com.mbeddr.cpp.ex-tests.build" uuid="0d16c091-1329-4385-9dc0-55a5a074a645" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
diff --git a/solutions/com.mbeddr.cpp.ts-tests.build/com.mbeddr.cpp.ts-tests.build.msd b/solutions/com.mbeddr.cpp.ts-tests.build/com.mbeddr.cpp.ts-tests.build.msd
index 42f7877f9f..72ecf74170 100644
--- a/solutions/com.mbeddr.cpp.ts-tests.build/com.mbeddr.cpp.ts-tests.build.msd
+++ b/solutions/com.mbeddr.cpp.ts-tests.build/com.mbeddr.cpp.ts-tests.build.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="com.mbeddr.cpp.ts-tests.build" uuid="d0529778-34ff-44ab-881c-872f96ce91ce" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>