diff --git a/build/org.eclipse.cdt.autotools-feature/feature.xml b/build/org.eclipse.cdt.autotools-feature/feature.xml
index 1a24d64c922..e2dc1b1b0c9 100644
--- a/build/org.eclipse.cdt.autotools-feature/feature.xml
+++ b/build/org.eclipse.cdt.autotools-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.autotools"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%provider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/build/org.eclipse.cdt.autotools-feature/pom.xml b/build/org.eclipse.cdt.autotools-feature/pom.xml
index f1caa494850..6a54de71448 100644
--- a/build/org.eclipse.cdt.autotools-feature/pom.xml
+++ b/build/org.eclipse.cdt.autotools-feature/pom.xml
@@ -12,7 +12,7 @@
         </parent>
 
         <groupId>org.eclipse.cdt.features</groupId>
-        <version>9.0.0-SNAPSHOT</version>
+        <version>9.0.1-SNAPSHOT</version>
         <artifactId>org.eclipse.cdt.autotools</artifactId>
         <packaging>eclipse-feature</packaging>
 </project>
diff --git a/build/org.eclipse.cdt.autotools.source-feature/feature.xml b/build/org.eclipse.cdt.autotools.source-feature/feature.xml
index 665a285ca73..69253227f70 100644
--- a/build/org.eclipse.cdt.autotools.source-feature/feature.xml
+++ b/build/org.eclipse.cdt.autotools.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.autotools.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%provider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/build/org.eclipse.cdt.autotools.source-feature/pom.xml b/build/org.eclipse.cdt.autotools.source-feature/pom.xml
index 145c6a08078..797921912c5 100644
--- a/build/org.eclipse.cdt.autotools.source-feature/pom.xml
+++ b/build/org.eclipse.cdt.autotools.source-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.autotools.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/build/org.eclipse.cdt.cmake-feature/feature.xml b/build/org.eclipse.cdt.cmake-feature/feature.xml
index a3ef7424aa4..1746e54ec93 100644
--- a/build/org.eclipse.cdt.cmake-feature/feature.xml
+++ b/build/org.eclipse.cdt.cmake-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.cmake"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/build/org.eclipse.cdt.cmake-feature/pom.xml b/build/org.eclipse.cdt.cmake-feature/pom.xml
index 653e62d863a..545b086e70a 100644
--- a/build/org.eclipse.cdt.cmake-feature/pom.xml
+++ b/build/org.eclipse.cdt.cmake-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.cmake</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/build/org.eclipse.cdt.gnu.build-feature/feature.xml b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
index e65c081819a..47b95f97262 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/feature.xml
+++ b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gnu.build"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/build/org.eclipse.cdt.gnu.build-feature/pom.xml b/build/org.eclipse.cdt.gnu.build-feature/pom.xml
index 62309d9c47b..6ef59f222a9 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/pom.xml
+++ b/build/org.eclipse.cdt.gnu.build-feature/pom.xml
@@ -14,4 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.gnu.build</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/build/org.eclipse.cdt.gnu.build.source-feature/feature.xml b/build/org.eclipse.cdt.gnu.build.source-feature/feature.xml
index a5b51f17b33..4e22ed1333a 100644
--- a/build/org.eclipse.cdt.gnu.build.source-feature/feature.xml
+++ b/build/org.eclipse.cdt.gnu.build.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gnu.build.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/build/org.eclipse.cdt.gnu.build.source-feature/pom.xml b/build/org.eclipse.cdt.gnu.build.source-feature/pom.xml
index 14699c1c743..4dec0de88b5 100644
--- a/build/org.eclipse.cdt.gnu.build.source-feature/pom.xml
+++ b/build/org.eclipse.cdt.gnu.build.source-feature/pom.xml
@@ -14,4 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.gnu.build.source</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml
index 37339007bcd..6f28a187670 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.build.crossgcc"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.build.crossgcc"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.build.crossgcc">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
index a619e2f87dd..1e511527c4c 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.build.crossgcc</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.xml
index e45d18849c0..8b97fcea027 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index eda5b3aff74..3b72662ee56 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.launch.remote"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml b/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
index e501d446a45..9ee3154b827 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.launch.remote</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index 3d89ba2fe3c..7bb02bf47f9 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Stand-alone C/C++ GDB Debugger" uid="org.eclipse.cdt.debug.application.product" id="org.eclipse.cdt.debug.application.product" application="org.eclipse.cdt.debug.application.app" version="9.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="Stand-alone C/C++ GDB Debugger" uid="org.eclipse.cdt.debug.application.product" id="org.eclipse.cdt.debug.application.product" application="org.eclipse.cdt.debug.application.app" version="9.0.1.qualifier" useFeatures="false" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.cdt.debug.application/icons/about.png"/>
diff --git a/debug/org.eclipse.cdt.debug.application.product/pom.xml b/debug/org.eclipse.cdt.debug.application.product/pom.xml
index af9bb231ee9..00fc762473f 100644
--- a/debug/org.eclipse.cdt.debug.application.product/pom.xml
+++ b/debug/org.eclipse.cdt.debug.application.product/pom.xml
@@ -4,7 +4,7 @@
 	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>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.debug.application.product</artifactId>
 	<packaging>eclipse-repository</packaging>
 	<name>Stand-Alone C/C++ Debugger Product</name>
diff --git a/debug/org.eclipse.cdt.debug.standalone-feature/feature.xml b/debug/org.eclipse.cdt.debug.standalone-feature/feature.xml
index 72952a2dbf3..bdb7994c905 100644
--- a/debug/org.eclipse.cdt.debug.standalone-feature/feature.xml
+++ b/debug/org.eclipse.cdt.debug.standalone-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.debug.standalone"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/debug/org.eclipse.cdt.debug.standalone-feature/pom.xml b/debug/org.eclipse.cdt.debug.standalone-feature/pom.xml
index 0b02e8e2bb0..db5bad9dd37 100644
--- a/debug/org.eclipse.cdt.debug.standalone-feature/pom.xml
+++ b/debug/org.eclipse.cdt.debug.standalone-feature/pom.xml
@@ -14,5 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.debug.standalone</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/debug/org.eclipse.cdt.debug.standalone.source-feature/feature.xml b/debug/org.eclipse.cdt.debug.standalone.source-feature/feature.xml
index 5f50846c56a..af8e7f26900 100644
--- a/debug/org.eclipse.cdt.debug.standalone.source-feature/feature.xml
+++ b/debug/org.eclipse.cdt.debug.standalone.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.debug.standalone.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/debug/org.eclipse.cdt.debug.standalone.source-feature/pom.xml b/debug/org.eclipse.cdt.debug.standalone.source-feature/pom.xml
index 947d6a7ae6a..8bd8519c455 100644
--- a/debug/org.eclipse.cdt.debug.standalone.source-feature/pom.xml
+++ b/debug/org.eclipse.cdt.debug.standalone.source-feature/pom.xml
@@ -14,5 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.debug.standalone.source</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/debug/org.eclipse.cdt.gdb-feature/feature.xml b/debug/org.eclipse.cdt.gdb-feature/feature.xml
index 8f97bea40eb..41205c6c338 100644
--- a/debug/org.eclipse.cdt.gdb-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gdb-feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.gdb"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.gdb"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.gdb">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/debug/org.eclipse.cdt.gdb-feature/pom.xml b/debug/org.eclipse.cdt.gdb-feature/pom.xml
index 6574e65b642..5fc2e2b5d46 100644
--- a/debug/org.eclipse.cdt.gdb-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gdb-feature/pom.xml
@@ -14,5 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.gdb</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/debug/org.eclipse.cdt.gdb.source-feature/feature.xml b/debug/org.eclipse.cdt.gdb.source-feature/feature.xml
index e941dfced83..0512a9c9b81 100644
--- a/debug/org.eclipse.cdt.gdb.source-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gdb.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gdb.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/debug/org.eclipse.cdt.gdb.source-feature/pom.xml b/debug/org.eclipse.cdt.gdb.source-feature/pom.xml
index 3e99b9ad4e9..65faeefd713 100644
--- a/debug/org.eclipse.cdt.gdb.source-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gdb.source-feature/pom.xml
@@ -14,5 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.gdb.source</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
index e4e4f28c591..2d1f239548a 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gnu.debug"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml b/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
index 1e6e107c743..98ad7ed6ab8 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
@@ -14,5 +14,5 @@
 	<groupId>org.eclipse.cdt.feature</groupId>
 	<artifactId>org.eclipse.cdt.gnu.debug</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/debug/org.eclipse.cdt.gnu.debug.source-feature/feature.xml b/debug/org.eclipse.cdt.gnu.debug.source-feature/feature.xml
index 739e0cc11da..fbdb5818041 100644
--- a/debug/org.eclipse.cdt.gnu.debug.source-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gnu.debug.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gnu.debug.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/debug/org.eclipse.cdt.gnu.debug.source-feature/pom.xml b/debug/org.eclipse.cdt.gnu.debug.source-feature/pom.xml
index 985a8210008..616a21cbfce 100644
--- a/debug/org.eclipse.cdt.gnu.debug.source-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gnu.debug.source-feature/pom.xml
@@ -14,5 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.gnu.debug.source</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
index f900cdb327d..f3a15bd153c 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gnu.dsf"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
index eb887fa6890..279bd5b0f4f 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.feature</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.gnu.dsf</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/feature.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/feature.xml
index ed4cf9fbb1e..c630f4fa3eb 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/feature.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gnu.dsf.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/pom.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/pom.xml
index b599b93ef1f..174ccd430b3 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf.source-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.gnu.dsf.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/feature.xml b/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/feature.xml
index 5a39e02483e..5b12a7b4760 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/feature.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gnu.multicorevisualizer"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/pom.xml b/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/pom.xml
index 52e44f65aa3..d48458b86ee 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.gnu.multicorevisualizer</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
index 4bcb46e3d67..4216c95fc44 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.examples.dsf"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.examples.dsf"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.examples.dsf">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
index e5f0b47cb37..090f8b51db9 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.examples.dsf</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/sourceTemplateFeature/feature.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/sourceTemplateFeature/feature.xml
index e45d18849c0..8b97fcea027 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/sourceTemplateFeature/feature.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
index a4710a4ce68..d79948d23dd 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.debug.gdbjtag"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
index e2f0afbdadf..d4b64bb154a 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.debug.gdbjtag</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/launch/org.eclipse.cdt.docker.launcher-feature/feature.xml b/launch/org.eclipse.cdt.docker.launcher-feature/feature.xml
index 3762826f589..06bbac0b073 100644
--- a/launch/org.eclipse.cdt.docker.launcher-feature/feature.xml
+++ b/launch/org.eclipse.cdt.docker.launcher-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.docker.launcher"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%provider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml b/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml
index c9358e40789..0b0f32002d1 100644
--- a/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml
+++ b/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml
@@ -12,7 +12,7 @@
         </parent>
 
         <groupId>org.eclipse.cdt.features</groupId>
-        <version>9.0.0-SNAPSHOT</version>
+        <version>9.0.1-SNAPSHOT</version>
         <artifactId>org.eclipse.cdt.docker.launcher</artifactId>
         <packaging>eclipse-feature</packaging>
 </project>
diff --git a/launch/org.eclipse.cdt.docker.launcher.source-feature/feature.xml b/launch/org.eclipse.cdt.docker.launcher.source-feature/feature.xml
index 656e24aa2ad..15b503919a4 100644
--- a/launch/org.eclipse.cdt.docker.launcher.source-feature/feature.xml
+++ b/launch/org.eclipse.cdt.docker.launcher.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.docker.launcher.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%provider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/launch/org.eclipse.cdt.docker.launcher.source-feature/pom.xml b/launch/org.eclipse.cdt.docker.launcher.source-feature/pom.xml
index a92de38c985..2debe6522ac 100644
--- a/launch/org.eclipse.cdt.docker.launcher.source-feature/pom.xml
+++ b/launch/org.eclipse.cdt.docker.launcher.source-feature/pom.xml
@@ -12,7 +12,7 @@
         </parent>
 
         <groupId>org.eclipse.cdt.features</groupId>
-        <version>9.0.0-SNAPSHOT</version>
+        <version>9.0.1-SNAPSHOT</version>
         <artifactId>org.eclipse.cdt.docker.launcher.source</artifactId>
         <packaging>eclipse-feature</packaging>
 </project>
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/feature.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/feature.xml
index bb0884fb841..0c4c481db52 100644
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/feature.xml
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.managedbuilder.llvm"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.managedbuilder.llvm.ui"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.managedbuilder.llvm.ui">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/pom.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/pom.xml
index 4bdef7eadca..e4c7fb47ea3 100644
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/pom.xml
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.managedbuilder.llvm</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
index 1b1222bfd8c..f995e1d770b 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.core.lrparser.feature"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.core.lrparser"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.core.lrparser">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.feature/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.feature/pom.xml
index 8faa5b94e6f..a1e1ac1a4b2 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.feature/pom.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.feature/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.core.lrparser.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml
index 3d223f14dee..2146ada6412 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.core.lrparser.sdk"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.core.lrparser.source"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.core.lrparser.source">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
index 3b5e3ea8f1a..430e29732fc 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.core.lrparser.sdk</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.source.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.source.feature/feature.xml
index 8c3b41373ff..8a258f45794 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.source.feature/feature.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.core.lrparser.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.source.feature/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.source.feature/pom.xml
index 8107dfdcb58..dac110ffba9 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.source.feature/pom.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.source.feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.core.lrparser.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml b/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml
index 2e31b155338..d2171585e50 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml
+++ b/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.debug.ui.memory"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -32,7 +32,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.cdt.debug.ui.memory.floatingpoint"
          download-size="0"
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
index 58f3bdbbb4b..fb08fedaeb0 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
+++ b/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.debug.ui.memory</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.xml b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.xml
index 19424c864f1..d786fe18694 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.xml
+++ b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.cdt.debug.ui.memory.source"
-      label="%featureName"
-      version="9.0.0.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <plugin
-         id="org.eclipse.cdt.debug.ui.memory.search.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.debug.ui.memory.traditional.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-    <plugin
-         id="org.eclipse.cdt.debug.ui.memory.floatingpoint.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-         
-   <plugin
-         id="org.eclipse.cdt.debug.ui.memory.transport.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.debug.ui.memory.memorybrowser.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.cdt.debug.ui.memory.source"
+      label="%featureName"
+      version="9.0.1.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.cdt.debug.ui.memory.search.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.debug.ui.memory.traditional.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.debug.ui.memory.floatingpoint.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.debug.ui.memory.transport.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.debug.ui.memory.memorybrowser.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.source-feature/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/pom.xml
index 63da0474344..e2a3655ef28 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.source-feature/pom.xml
+++ b/memory/org.eclipse.cdt.debug.ui.memory.source-feature/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.debug.ui.memory.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/qt/org.eclipse.cdt.qt-feature/feature.xml b/qt/org.eclipse.cdt.qt-feature/feature.xml
index 5883efeb130..b5e52c25ec3 100644
--- a/qt/org.eclipse.cdt.qt-feature/feature.xml
+++ b/qt/org.eclipse.cdt.qt-feature/feature.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.cdt.qt"
-      label="%featureName"
-      version="9.0.0.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.launchbar" version="2.0.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.cdt.qt.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.qt.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.cdt.qt"
+      label="%featureName"
+      version="9.0.1.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.launchbar" version="2.0.0" match="compatible"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.cdt.qt.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.qt.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/qt/org.eclipse.cdt.qt-feature/pom.xml b/qt/org.eclipse.cdt.qt-feature/pom.xml
index cad4e8a11d3..e05f7613b27 100644
--- a/qt/org.eclipse.cdt.qt-feature/pom.xml
+++ b/qt/org.eclipse.cdt.qt-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.qt</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index dfb856e4bcb..f60f519380b 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt-feature/pom.xml b/releng/org.eclipse.cdt-feature/pom.xml
index a3ae2cf2e30..0703f54a55f 100644
--- a/releng/org.eclipse.cdt-feature/pom.xml
+++ b/releng/org.eclipse.cdt-feature/pom.xml
@@ -14,4 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/releng/org.eclipse.cdt.native-feature/feature.xml b/releng/org.eclipse.cdt.native-feature/feature.xml
index 385a3cf77c3..2cd94e2308f 100644
--- a/releng/org.eclipse.cdt.native-feature/feature.xml
+++ b/releng/org.eclipse.cdt.native-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.native"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt.native-feature/pom.xml b/releng/org.eclipse.cdt.native-feature/pom.xml
index d9c64d7ca23..c269118e08e 100644
--- a/releng/org.eclipse.cdt.native-feature/pom.xml
+++ b/releng/org.eclipse.cdt.native-feature/pom.xml
@@ -14,4 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.native</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/releng/org.eclipse.cdt.native.source-feature/feature.xml b/releng/org.eclipse.cdt.native.source-feature/feature.xml
index 14e2da73864..77de0eb53f3 100644
--- a/releng/org.eclipse.cdt.native.source-feature/feature.xml
+++ b/releng/org.eclipse.cdt.native.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.native.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt.native.source-feature/pom.xml b/releng/org.eclipse.cdt.native.source-feature/pom.xml
index 6dc9cf1049f..3d83fb449d6 100644
--- a/releng/org.eclipse.cdt.native.source-feature/pom.xml
+++ b/releng/org.eclipse.cdt.native.source-feature/pom.xml
@@ -14,4 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.native.source</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml
index 8ff9b23e5da..15441e494b3 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.platform"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt.platform-feature/pom.xml b/releng/org.eclipse.cdt.platform-feature/pom.xml
index affc969c2c1..6a439ceccbc 100644
--- a/releng/org.eclipse.cdt.platform-feature/pom.xml
+++ b/releng/org.eclipse.cdt.platform-feature/pom.xml
@@ -14,4 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.platform</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/releng/org.eclipse.cdt.platform.source-feature/feature.xml b/releng/org.eclipse.cdt.platform.source-feature/feature.xml
index 508f5c63ac2..72c0f2f32dc 100644
--- a/releng/org.eclipse.cdt.platform.source-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.platform.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt.platform.source-feature/pom.xml b/releng/org.eclipse.cdt.platform.source-feature/pom.xml
index 49f6846ff0c..6acb222b46c 100644
--- a/releng/org.eclipse.cdt.platform.source-feature/pom.xml
+++ b/releng/org.eclipse.cdt.platform.source-feature/pom.xml
@@ -14,4 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.platform.source</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 5012b77d525..364f9e11a3f 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.sdk"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt.sdk-feature/pom.xml b/releng/org.eclipse.cdt.sdk-feature/pom.xml
index 14c098f2bf3..55e85639722 100644
--- a/releng/org.eclipse.cdt.sdk-feature/pom.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/pom.xml
@@ -14,4 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.sdk</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index c0445b4715c..eb00e932950 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.testing"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt.testing-feature/pom.xml b/releng/org.eclipse.cdt.testing-feature/pom.xml
index c6adc1050b7..cd02272a9d6 100644
--- a/releng/org.eclipse.cdt.testing-feature/pom.xml
+++ b/releng/org.eclipse.cdt.testing-feature/pom.xml
@@ -14,4 +14,5 @@
 	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.testing</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/remote/org.eclipse.cdt.remote-feature/feature.xml b/remote/org.eclipse.cdt.remote-feature/feature.xml
index d027c3e30eb..42473732bbe 100644
--- a/remote/org.eclipse.cdt.remote-feature/feature.xml
+++ b/remote/org.eclipse.cdt.remote-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.remote"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%featureVendor"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/remote/org.eclipse.cdt.remote-feature/pom.xml b/remote/org.eclipse.cdt.remote-feature/pom.xml
index 6a2c8ab48f0..8f091f56b33 100644
--- a/remote/org.eclipse.cdt.remote-feature/pom.xml
+++ b/remote/org.eclipse.cdt.remote-feature/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.remote</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.feature/feature.xml b/testsrunner/org.eclipse.cdt.testsrunner.feature/feature.xml
index 31d1b81773b..858e62e0cd8 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.feature/feature.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.testsrunner.feature"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.feature/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.feature/pom.xml
index 66fa9d743db..c7acf6c323a 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.feature/pom.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner.feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.testsrunner.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.source.feature/feature.xml b/testsrunner/org.eclipse.cdt.testsrunner.source.feature/feature.xml
index 30d42724528..8bb58cda319 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.source.feature/feature.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.testsrunner.source.feature"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.source.feature/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.source.feature/pom.xml
index ecefad2c4e0..3932d469c9c 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.source.feature/pom.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner.source.feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.testsrunner.source.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
index a01625ef990..02e3565943c 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
+++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.cdt.arduino"
-      label="%featureName"
-      version="9.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.cdt.arduino.ui"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.launchbar" version="1.0.0"/>
-      <import feature="org.eclipse.remote.serial" version="1.0.0"/>
-      <import feature="org.eclipse.remote" version="2.0.0"/>
-      <import feature="org.eclipse.remote.console" version="2.0.0"/>
-      <import feature="org.eclipse.cdt" version="9.0.0"/>
-      <import feature="org.eclipse.launchbar.remote" version="1.0.0"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.cdt.arduino.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.arduino.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.cdt.arduino"
+      label="%featureName"
+      version="9.0.1.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.cdt.arduino.ui"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.launchbar" version="1.0.0"/>
+      <import feature="org.eclipse.remote.serial" version="1.0.0"/>
+      <import feature="org.eclipse.remote" version="2.0.0"/>
+      <import feature="org.eclipse.remote.console" version="2.0.0"/>
+      <import feature="org.eclipse.cdt" version="9.0.0"/>
+      <import feature="org.eclipse.launchbar.remote" version="1.0.0"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.cdt.arduino.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.cdt.arduino.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/pom.xml b/toolchains/arduino/org.eclipse.cdt.arduino-feature/pom.xml
index d1e0db3b06e..1808ac84c86 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/pom.xml
+++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/pom.xml
@@ -12,4 +12,5 @@
 
 	<artifactId>org.eclipse.cdt.arduino</artifactId>
 	<packaging>eclipse-feature</packaging>
+	<version>9.0.1-SNAPSHOT</version>
 </project>
diff --git a/upc/org.eclipse.cdt.bupc-feature/feature.xml b/upc/org.eclipse.cdt.bupc-feature/feature.xml
index e1d2f18c176..e7b584177fb 100644
--- a/upc/org.eclipse.cdt.bupc-feature/feature.xml
+++ b/upc/org.eclipse.cdt.bupc-feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.bupc"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.managedbuilder.bupc.ui"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.managedbuilder.bupc.ui">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/upc/org.eclipse.cdt.bupc-feature/pom.xml b/upc/org.eclipse.cdt.bupc-feature/pom.xml
index f4c82002bc9..fac14ef321b 100644
--- a/upc/org.eclipse.cdt.bupc-feature/pom.xml
+++ b/upc/org.eclipse.cdt.bupc-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.bupc</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
index 3f3b22628b8..11bcfeccc0d 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.core.parser.upc.feature"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.core.parser.upc"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.core.parser.upc">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.feature/pom.xml
index 887c98ab5b9..fb4ff324f28 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/pom.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.feature/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.core.parser.upc.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
index 1de67afac1d..4d4af06b15a 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.core.parser.upc.sdk"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.core.parser.upc.source"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.core.parser.upc.source">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
index f8147cf0c23..ca13363064a 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.core.parser.upc.sdk</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml
index 7432b137032..765891d68b6 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.core.parser.upc.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml
index 3386da76393..ac6dfc03c66 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.core.parser.upc.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/util/org.eclipse.cdt.util-feature/feature.xml b/util/org.eclipse.cdt.util-feature/feature.xml
index 721d08cdf05..4d608d9ed4a 100644
--- a/util/org.eclipse.cdt.util-feature/feature.xml
+++ b/util/org.eclipse.cdt.util-feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.util"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.util"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.util">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/util/org.eclipse.cdt.util-feature/pom.xml b/util/org.eclipse.cdt.util-feature/pom.xml
index 2ad3de2062d..dbfcbbf3354 100644
--- a/util/org.eclipse.cdt.util-feature/pom.xml
+++ b/util/org.eclipse.cdt.util-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.util</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/visualizer/org.eclipse.cdt.visualizer-feature/feature.xml b/visualizer/org.eclipse.cdt.visualizer-feature/feature.xml
index f0d194c91ec..90469ddacd3 100644
--- a/visualizer/org.eclipse.cdt.visualizer-feature/feature.xml
+++ b/visualizer/org.eclipse.cdt.visualizer-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.visualizer"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/visualizer/org.eclipse.cdt.visualizer-feature/pom.xml b/visualizer/org.eclipse.cdt.visualizer-feature/pom.xml
index d527354d88a..af0e66401db 100644
--- a/visualizer/org.eclipse.cdt.visualizer-feature/pom.xml
+++ b/visualizer/org.eclipse.cdt.visualizer-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.visualizer</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/windows/org.eclipse.cdt.msw-feature/feature.xml b/windows/org.eclipse.cdt.msw-feature/feature.xml
index 6cc9a6e8fd7..b75bc76d0f7 100644
--- a/windows/org.eclipse.cdt.msw-feature/feature.xml
+++ b/windows/org.eclipse.cdt.msw-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.msw"
       label="C/C++ Visual C++ Support"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="Eclipse CDT"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/windows/org.eclipse.cdt.msw-feature/pom.xml b/windows/org.eclipse.cdt.msw-feature/pom.xml
index 3ffff67c9d8..452a588a33a 100644
--- a/windows/org.eclipse.cdt.msw-feature/pom.xml
+++ b/windows/org.eclipse.cdt.msw-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.msw</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/xlc/org.eclipse.cdt.xlc.feature/feature.xml b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
index 3a6786c40eb..50cdb5cc22a 100644
--- a/xlc/org.eclipse.cdt.xlc.feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.cdt.xlc.feature"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.cdt.managedbuilder.xlc.core"
       license-feature="org.eclipse.license"
-      license-feature-version="0.0.0"
-      plugin="org.eclipse.cdt.managedbuilder.xlc.core">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/xlc/org.eclipse.cdt.xlc.feature/pom.xml b/xlc/org.eclipse.cdt.xlc.feature/pom.xml
index 3d8795eba39..9267072d0ee 100644
--- a/xlc/org.eclipse.cdt.xlc.feature/pom.xml
+++ b/xlc/org.eclipse.cdt.xlc.feature/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.xlc.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
index 3229de0bda2..cb87725c1a4 100644
--- a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.xlc.sdk"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
index fcdcd2382f1..d7b2ccacf31 100644
--- a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
+++ b/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.xlc.sdk</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/xlc/org.eclipse.cdt.xlc.source.feature/feature.xml b/xlc/org.eclipse.cdt.xlc.source.feature/feature.xml
index 40f08f8b0b9..37dfc3ec4c7 100644
--- a/xlc/org.eclipse.cdt.xlc.source.feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.xlc.source"
       label="%featureName"
-      version="9.0.0.qualifier"
+      version="9.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml b/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml
index 8569c52d39b..c792570710c 100644
--- a/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml
+++ b/xlc/org.eclipse.cdt.xlc.source.feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.0.0-SNAPSHOT</version>
+	<version>9.0.1-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.xlc.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>