diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c70a52755..06562cf27b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
### Fixed
+- Variability: The editing of feature models in tree layout has been improved. E.g., typing ENTER on a feature will create a new sibling. Typing ":" in a feature's name will change it to a feature model include node. The intentions "Change to feature / feature model include" previously lost information about the feature, this is also fixed.
- Variability: Fix workaround for using for-all-variants checking rules outside the IDE (e.g., on a build server). Due to MPS-34340, the for-all-variants checking cannot be done outside the IDE if the model under check has more than one root nodes. This bugfix includes roots of LogicalChildren in the list of used root nodes.
- Physical units (language `org.iets3.core.expr.typetags.physunits`): Update unit in typesystem after prefix has been removed (e.g., from "cm" to "m").
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
index fb6b9e4859..bf6f38b846 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
@@ -49,9 +49,9 @@
+
-
@@ -469,6 +469,7 @@
+
@@ -5499,9 +5500,9 @@
-
-
-
+
+
+
@@ -7056,166 +7057,171 @@
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
+
-
-
-
-
+
+
+
+
@@ -9048,5 +9054,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.intentions.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.intentions.mps
index 2f89fcd3f2..8f8d32f60f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.intentions.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.intentions.mps
@@ -460,6 +460,7 @@
+
@@ -1653,6 +1654,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
index c99d2b0c61..bbe6791be9 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.notpresentvalue.mps
@@ -30,6 +30,7 @@
+
@@ -62,6 +63,9 @@
+
+
+
@@ -134,6 +138,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
index c9603b501b..13ef629921 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.editor@tests.mps
@@ -18,6 +18,9 @@
+
+
+
@@ -35,6 +38,9 @@
+
+
+
@@ -56,6 +62,12 @@
+
+
+
+
+
+
@@ -1552,5 +1564,201 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+