diff --git a/doc/org.eclipse.eef.documentation.export/META-INF/MANIFEST.MF b/doc/org.eclipse.eef.documentation.export/META-INF/MANIFEST.MF
index 6ef6642a7..fc39b2715 100644
--- a/doc/org.eclipse.eef.documentation.export/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.eef.documentation.export/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.documentation.export
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
diff --git a/doc/org.eclipse.eef.documentation.export/pom.xml b/doc/org.eclipse.eef.documentation.export/pom.xml
index 79d62d02f..d5011e4c1 100644
--- a/doc/org.eclipse.eef.documentation.export/pom.xml
+++ b/doc/org.eclipse.eef.documentation.export/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/doc/org.eclipse.eef.documentation.ext.widgets.reference/META-INF/MANIFEST.MF b/doc/org.eclipse.eef.documentation.ext.widgets.reference/META-INF/MANIFEST.MF
index 77e5df6e6..d235434b7 100644
--- a/doc/org.eclipse.eef.documentation.ext.widgets.reference/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.eef.documentation.ext.widgets.reference/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.documentation.ext.widgets.reference;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.6.0,4.0.0)",
diff --git a/doc/org.eclipse.eef.documentation.ext.widgets.reference/pom.xml b/doc/org.eclipse.eef.documentation.ext.widgets.reference/pom.xml
index 389f539cc..d9787890e 100644
--- a/doc/org.eclipse.eef.documentation.ext.widgets.reference/pom.xml
+++ b/doc/org.eclipse.eef.documentation.ext.widgets.reference/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/doc/org.eclipse.eef.documentation.javadoc/META-INF/MANIFEST.MF b/doc/org.eclipse.eef.documentation.javadoc/META-INF/MANIFEST.MF
index 3686696c2..0920951c0 100644
--- a/doc/org.eclipse.eef.documentation.javadoc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.eef.documentation.javadoc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.documentation.javadoc;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.0.0,4.0.0)"
diff --git a/doc/org.eclipse.eef.documentation.javadoc/pom.xml b/doc/org.eclipse.eef.documentation.javadoc/pom.xml
index 5d364d13b..c6c3284d1 100644
--- a/doc/org.eclipse.eef.documentation.javadoc/pom.xml
+++ b/doc/org.eclipse.eef.documentation.javadoc/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/doc/org.eclipse.eef.documentation/META-INF/MANIFEST.MF b/doc/org.eclipse.eef.documentation/META-INF/MANIFEST.MF
index af56cad3d..16647f014 100644
--- a/doc/org.eclipse.eef.documentation/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.eef.documentation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.documentation;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.0.0,4.0.0)"
diff --git a/doc/org.eclipse.eef.documentation/pom.xml b/doc/org.eclipse.eef.documentation/pom.xml
index ac4e2ad4a..0b361053b 100644
--- a/doc/org.eclipse.eef.documentation/pom.xml
+++ b/doc/org.eclipse.eef.documentation/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.eef.ext.widgets.reference-feature/feature.xml b/features/org.eclipse.eef.ext.widgets.reference-feature/feature.xml
index 557558d0b..6b9cfa418 100644
--- a/features/org.eclipse.eef.ext.widgets.reference-feature/feature.xml
+++ b/features/org.eclipse.eef.ext.widgets.reference-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.eef.ext.widgets.reference.feature"
       label="%featureName"
-      version="2.1.7.qualifier"
+      version="2.1.8.qualifier"
       provider-name="%featureProvider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.eef.ext.widgets.reference-feature/pom.xml b/features/org.eclipse.eef.ext.widgets.reference-feature/pom.xml
index cfafbc108..2f77bb361 100644
--- a/features/org.eclipse.eef.ext.widgets.reference-feature/pom.xml
+++ b/features/org.eclipse.eef.ext.widgets.reference-feature/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.eef.sdk-feature/feature.xml b/features/org.eclipse.eef.sdk-feature/feature.xml
index 7c04e5d39..3105a21a3 100644
--- a/features/org.eclipse.eef.sdk-feature/feature.xml
+++ b/features/org.eclipse.eef.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.eef.sdk.feature"
       label="%featureName"
-      version="2.1.7.qualifier"
+      version="2.1.8.qualifier"
       provider-name="%featureProvider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.eef.sdk-feature/pom.xml b/features/org.eclipse.eef.sdk-feature/pom.xml
index 10c112716..40e03a186 100644
--- a/features/org.eclipse.eef.sdk-feature/pom.xml
+++ b/features/org.eclipse.eef.sdk-feature/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.common.ui/META-INF/MANIFEST.MF
index ce08c94ea..e9c5c0084 100644
--- a/plugins/org.eclipse.eef.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.common.ui
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.eef.common.ui/pom.xml b/plugins/org.eclipse.eef.common.ui/pom.xml
index b5117031e..2c6463423 100644
--- a/plugins/org.eclipse.eef.common.ui/pom.xml
+++ b/plugins/org.eclipse.eef.common.ui/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.common/META-INF/MANIFEST.MF
index 019c6aba1..fcdafe41f 100644
--- a/plugins/org.eclipse.eef.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.common;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.eef.common/pom.xml b/plugins/org.eclipse.eef.common/pom.xml
index 05c1f13d0..367c6d810 100644
--- a/plugins/org.eclipse.eef.common/pom.xml
+++ b/plugins/org.eclipse.eef.common/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.core.ext.widgets.reference/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.core.ext.widgets.reference/META-INF/MANIFEST.MF
index 16b97a522..470c743f1 100644
--- a/plugins/org.eclipse.eef.core.ext.widgets.reference/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.core.ext.widgets.reference/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.core.ext.widgets.reference
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.eef.core;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/org.eclipse.eef.core.ext.widgets.reference/pom.xml b/plugins/org.eclipse.eef.core.ext.widgets.reference/pom.xml
index cdbcfd06b..77c080947 100644
--- a/plugins/org.eclipse.eef.core.ext.widgets.reference/pom.xml
+++ b/plugins/org.eclipse.eef.core.ext.widgets.reference/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF
index ef15acd98..1e8ed848a 100644
--- a/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.core;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
diff --git a/plugins/org.eclipse.eef.core/pom.xml b/plugins/org.eclipse.eef.core/pom.xml
index 82492bd37..b145dd9f3 100644
--- a/plugins/org.eclipse.eef.core/pom.xml
+++ b/plugins/org.eclipse.eef.core/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.edit/META-INF/MANIFEST.MF
index e2f80911e..cc6e515f9 100644
--- a/plugins/org.eclipse.eef.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.edit;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.eef.provider.EefEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.eef.edit/pom.xml b/plugins/org.eclipse.eef.edit/pom.xml
index 730a0e656..e9c7e2cbd 100644
--- a/plugins/org.eclipse.eef.edit/pom.xml
+++ b/plugins/org.eclipse.eef.edit/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.ext.widgets.reference/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ext.widgets.reference/META-INF/MANIFEST.MF
index 2847f6e40..66d74c5b2 100644
--- a/plugins/org.eclipse.eef.ext.widgets.reference/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.ext.widgets.reference/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.ext.widgets.reference;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.eef.ext.widgets.reference/pom.xml b/plugins/org.eclipse.eef.ext.widgets.reference/pom.xml
index a484ca04b..0213663e0 100644
--- a/plugins/org.eclipse.eef.ext.widgets.reference/pom.xml
+++ b/plugins/org.eclipse.eef.ext.widgets.reference/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/META-INF/MANIFEST.MF
index 885c80a14..5a7432b20 100644
--- a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.ide.ui.ext.widgets.reference;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.eef;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/pom.xml b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/pom.xml
index c14db71e1..747260d69 100644
--- a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/pom.xml
+++ b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.ide.ui.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide.ui.properties/META-INF/MANIFEST.MF
index 1f053cc1c..6326c2127 100644
--- a/plugins/org.eclipse.eef.ide.ui.properties/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.ide.ui.properties/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.ide.ui.properties
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.eef.ide.ui.properties/pom.xml b/plugins/org.eclipse.eef.ide.ui.properties/pom.xml
index e63ee170f..d059123a2 100644
--- a/plugins/org.eclipse.eef.ide.ui.properties/pom.xml
+++ b/plugins/org.eclipse.eef.ide.ui.properties/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF
index 63bbc95a5..ef1669c82 100644
--- a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.ide.ui;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.sirius.common.interpreter.api;version="1.0.0"
diff --git a/plugins/org.eclipse.eef.ide.ui/pom.xml b/plugins/org.eclipse.eef.ide.ui/pom.xml
index 28d6d5bf4..aba3c2ed3 100644
--- a/plugins/org.eclipse.eef.ide.ui/pom.xml
+++ b/plugins/org.eclipse.eef.ide.ui/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF
index 257a61b75..9f53c16a8 100644
--- a/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.ide;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Activator: org.eclipse.eef.ide.internal.EEFIdePlugin$Implementation
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
diff --git a/plugins/org.eclipse.eef.ide/pom.xml b/plugins/org.eclipse.eef.ide/pom.xml
index c6a6508c5..82efbc829 100644
--- a/plugins/org.eclipse.eef.ide/pom.xml
+++ b/plugins/org.eclipse.eef.ide/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.properties.ui.legacy/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.properties.ui.legacy/META-INF/MANIFEST.MF
index c319e37e1..ba304177f 100644
--- a/plugins/org.eclipse.eef.properties.ui.legacy/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.properties.ui.legacy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.properties.ui.legacy;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Activator: org.eclipse.eef.properties.ui.legacy.internal.EEFPropertiesUiLegacyPlugin$Implementation
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
diff --git a/plugins/org.eclipse.eef.properties.ui.legacy/pom.xml b/plugins/org.eclipse.eef.properties.ui.legacy/pom.xml
index 1030c8779..238a52b87 100644
--- a/plugins/org.eclipse.eef.properties.ui.legacy/pom.xml
+++ b/plugins/org.eclipse.eef.properties.ui.legacy/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.eef.properties.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.properties.ui/META-INF/MANIFEST.MF
index 69f333842..24e33e1f4 100644
--- a/plugins/org.eclipse.eef.properties.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.properties.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.properties.ui;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Activator: org.eclipse.eef.properties.ui.internal.EEFTabbedPropertyViewPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.eef.properties.ui/pom.xml b/plugins/org.eclipse.eef.properties.ui/pom.xml
index 559337033..cc14fae2e 100644
--- a/plugins/org.eclipse.eef.properties.ui/pom.xml
+++ b/plugins/org.eclipse.eef.properties.ui/pom.xml
@@ -17,13 +17,13 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
   <artifactId>org.eclipse.eef.properties.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>2.1.7-SNAPSHOT</version>
+  <version>2.1.8-SNAPSHOT</version>
   
   <name>EEF Properties UI</name>
 
diff --git a/plugins/org.eclipse.eef/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef/META-INF/MANIFEST.MF
index 33749ab45..49a9a4718 100644
--- a/plugins/org.eclipse.eef/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.eef/pom.xml b/plugins/org.eclipse.eef/pom.xml
index 879faf23a..254abc6ba 100644
--- a/plugins/org.eclipse.eef/pom.xml
+++ b/plugins/org.eclipse.eef/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.eef.releng/pom.xml b/releng/org.eclipse.eef.releng/pom.xml
index d4369f40e..9fc1eb754 100644
--- a/releng/org.eclipse.eef.releng/pom.xml
+++ b/releng/org.eclipse.eef.releng/pom.xml
@@ -13,7 +13,7 @@ Contributors: Obeo - initial API and implementation
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>2.1.7-SNAPSHOT</version>
+  <version>2.1.8-SNAPSHOT</version>
   <groupId>org.eclipse.eef</groupId>
   <artifactId>org.eclipse.eef.parent</artifactId>
   <packaging>pom</packaging>
diff --git a/releng/org.eclipse.eef.releng/publish-nightly.sh b/releng/org.eclipse.eef.releng/publish-nightly.sh
index 62c74487a..d78fd00cc 100755
--- a/releng/org.eclipse.eef.releng/publish-nightly.sh
+++ b/releng/org.eclipse.eef.releng/publish-nightly.sh
@@ -30,7 +30,7 @@ provided by the Hudson build.
 set -e
 
 # The full version (should be taken as an argument)
-export VERSION="2.1.7"
+export VERSION="2.1.8"
 export PLATFORM="2019-12"
 
 # The type of build being published
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/2018-09/pom.xml b/releng/org.eclipse.eef.releng/targetplatforms/2018-09/pom.xml
index 162815777..c53841c3a 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/2018-09/pom.xml
+++ b/releng/org.eclipse.eef.releng/targetplatforms/2018-09/pom.xml
@@ -16,7 +16,7 @@ Contributors:
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/2018-12/pom.xml b/releng/org.eclipse.eef.releng/targetplatforms/2018-12/pom.xml
index e92e5da88..cf42dd3da 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/2018-12/pom.xml
+++ b/releng/org.eclipse.eef.releng/targetplatforms/2018-12/pom.xml
@@ -16,7 +16,7 @@ Contributors:
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/2019-12/pom.xml b/releng/org.eclipse.eef.releng/targetplatforms/2019-12/pom.xml
index 79618f572..01fb32505 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/2019-12/pom.xml
+++ b/releng/org.eclipse.eef.releng/targetplatforms/2019-12/pom.xml
@@ -16,7 +16,7 @@ Contributors:
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/luna/pom.xml b/releng/org.eclipse.eef.releng/targetplatforms/luna/pom.xml
index e26f83ea3..94894dbe8 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/luna/pom.xml
+++ b/releng/org.eclipse.eef.releng/targetplatforms/luna/pom.xml
@@ -16,7 +16,7 @@ Contributors:
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/neon/pom.xml b/releng/org.eclipse.eef.releng/targetplatforms/neon/pom.xml
index 6879a5303..757a117e1 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/neon/pom.xml
+++ b/releng/org.eclipse.eef.releng/targetplatforms/neon/pom.xml
@@ -16,7 +16,7 @@ Contributors:
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/oxygen/pom.xml b/releng/org.eclipse.eef.releng/targetplatforms/oxygen/pom.xml
index de79d2ee2..27a8ae50b 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/oxygen/pom.xml
+++ b/releng/org.eclipse.eef.releng/targetplatforms/oxygen/pom.xml
@@ -16,7 +16,7 @@ Contributors:
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/photon/pom.xml b/releng/org.eclipse.eef.releng/targetplatforms/photon/pom.xml
index 963177e1a..ce6c67216 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/photon/pom.xml
+++ b/releng/org.eclipse.eef.releng/targetplatforms/photon/pom.xml
@@ -16,7 +16,7 @@ Contributors:
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.eef.update/pom.xml b/releng/org.eclipse.eef.update/pom.xml
index 5303c8704..96688df83 100644
--- a/releng/org.eclipse.eef.update/pom.xml
+++ b/releng/org.eclipse.eef.update/pom.xml
@@ -18,7 +18,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF
index 58ead419c..c3601ef60 100644
--- a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF
+++ b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.sample.custom.widget.colorpicker;singleton:=true
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.eef;version="[2.0.0,3.0.0)",
diff --git a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF
index 6df90d6a8..5c3da88c3 100644
--- a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.tests
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.eef.tests/pom.xml b/tests/org.eclipse.eef.tests/pom.xml
index bceb8a59d..f9c6389e5 100644
--- a/tests/org.eclipse.eef.tests/pom.xml
+++ b/tests/org.eclipse.eef.tests/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.eef.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.eef.ui.tests/META-INF/MANIFEST.MF
index af4e8adba..74cb9985c 100644
--- a/tests/org.eclipse.eef.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.eef.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.ui.tests
-Bundle-Version: 2.1.7.qualifier
+Bundle-Version: 2.1.8.qualifier
 Bundle-Vendor: %providerName
 Automatic-Module-Name: org.eclipse.eef.ui.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.eef.ui.tests/pom.xml b/tests/org.eclipse.eef.ui.tests/pom.xml
index c08e81687..5f48be63a 100644
--- a/tests/org.eclipse.eef.ui.tests/pom.xml
+++ b/tests/org.eclipse.eef.ui.tests/pom.xml
@@ -17,7 +17,7 @@ Contributors: Obeo - initial API and implementation
   <parent>
     <groupId>org.eclipse.eef</groupId>
     <artifactId>org.eclipse.eef.parent</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
   </parent>