diff --git a/build/org.eclipse.cdt.autotools-feature/feature.xml b/build/org.eclipse.cdt.autotools-feature/feature.xml
index fe4bc9a1764..4710b3f3cc0 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%provider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/build/org.eclipse.cdt.cmake-feature/feature.xml b/build/org.eclipse.cdt.cmake-feature/feature.xml
index a67d78338f8..da655afc27b 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.3.0.qualifier"
+      version="9.4.0.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/feature.xml b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
index 967aabfc8c4..91f7e157e9b 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml
index aa31bc95a42..bc660e4eeaf 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index 5783a67330f..00000000000
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.cdt</groupId>
-		<artifactId>cdt-parent</artifactId>
-		<version>9.3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.3.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.build.crossgcc</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index d1a94965bcc..fef194e047d 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index 20be1fe60f6..00000000000
--- a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.cdt</groupId>
-		<artifactId>cdt-parent</artifactId>
-		<version>9.3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.3.0-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 6aa5ff17659..91d95dc72a1 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.3.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.4.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.cdt.debug.application/icons/about.png"/>
diff --git a/debug/org.eclipse.cdt.debug.standalone-feature/feature.xml b/debug/org.eclipse.cdt.debug.standalone-feature/feature.xml
index f7b3c2c21ea..6679ee6da2c 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/debug/org.eclipse.cdt.gdb-feature/feature.xml b/debug/org.eclipse.cdt.gdb-feature/feature.xml
index 3303d688a0f..b3a847fdd1a 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index b516866f687..00000000000
--- a/debug/org.eclipse.cdt.gdb-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.cdt</groupId>
-		<artifactId>cdt-parent</artifactId>
-		<version>9.3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.cdt.features</groupId>
-	<artifactId>org.eclipse.cdt.gdb</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<version>9.3.0-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 2980648a1db..ec8b3dd722a 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.3.0.qualifier"
+      version="9.4.0.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/feature.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
index 90ddbaf953b..32a3e5faf44 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.3.0.qualifier"
+      version="9.4.0.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/feature.xml b/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/feature.xml
index f146df4be5d..eb9ffc0b40d 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
index 1158af8c4f1..defd4da9690 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index bf084f1b824..00000000000
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.cdt</groupId>
-		<artifactId>cdt-parent</artifactId>
-		<version>9.3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.3.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.examples.dsf</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
index 5940f1a2445..9e08411a55e 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index 329c2972568..00000000000
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.cdt</groupId>
-		<artifactId>cdt-parent</artifactId>
-		<version>9.3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.3.0-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 bd9a9725637..26fe70475e4 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index 383976a61d8..00000000000
--- a/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <modelVersion>4.0.0</modelVersion>
-
-        <parent>
-                <groupId>org.eclipse.cdt</groupId>
-                <artifactId>cdt-parent</artifactId>
-                <version>9.3.0-SNAPSHOT</version>
-                <relativePath>../../pom.xml</relativePath>
-        </parent>
-
-        <groupId>org.eclipse.cdt.features</groupId>
-        <version>9.3.0-SNAPSHOT</version>
-        <artifactId>org.eclipse.cdt.docker.launcher</artifactId>
-        <packaging>eclipse-feature</packaging>
-</project>
diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb-feature/feature.xml b/llvm/org.eclipse.cdt.llvm.dsf.lldb-feature/feature.xml
index fab48fd7fcb..81c522677c3 100644
--- a/llvm/org.eclipse.cdt.llvm.dsf.lldb-feature/feature.xml
+++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.llvm.dsf.lldb"
       label="%featureName"
-      version="1.0.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/feature.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/feature.xml
index 125f4564a06..bdf8e78f93f 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.3.0.qualifier"
+      version="9.4.0.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/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
index adc90465435..83faa1bb389 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.3.0.qualifier"
+      version="9.4.0.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.sdk.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml
index 875f5fd8f9e..6e91fd3730b 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.3.0.qualifier"
+      version="9.4.0.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/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml b/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml
index b4695216ae6..a330d943cb0 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.3.0.qualifier"
+      version="9.4.0.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/qt/org.eclipse.cdt.qt-feature/feature.xml b/qt/org.eclipse.cdt.qt-feature/feature.xml
index 9ee95163f25..a5c66f86a1c 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.3.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.4.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>
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index be87a8a4101..3576609619b 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index e3dee3aec6b..00000000000
--- a/releng/org.eclipse.cdt-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.cdt</groupId>
-		<artifactId>cdt-parent</artifactId>
-		<version>9.3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.cdt.features</groupId>
-	<artifactId>org.eclipse.cdt</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
diff --git a/releng/org.eclipse.cdt.native-feature/feature.xml b/releng/org.eclipse.cdt.native-feature/feature.xml
index ee74a9f5be9..d170b94f893 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml
index 4f954071040..d5ac451b364 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 293d3a2ed3b..b2541523d1c 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index 172b340bc8c..00000000000
--- a/releng/org.eclipse.cdt.sdk-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.cdt</groupId>
-		<artifactId>cdt-parent</artifactId>
-		<version>9.3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.cdt.features</groupId>
-	<artifactId>org.eclipse.cdt.sdk</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index d09a1bd61e3..d058bd44be9 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index a575016236e..00000000000
--- a/releng/org.eclipse.cdt.testing-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.cdt</groupId>
-		<artifactId>cdt-parent</artifactId>
-		<version>9.3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.cdt.features</groupId>
-	<artifactId>org.eclipse.cdt.testing</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
diff --git a/remote/org.eclipse.cdt.remote-feature/feature.xml b/remote/org.eclipse.cdt.remote-feature/feature.xml
index a9abe3705a7..554492e6db6 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%featureVendor"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.feature/feature.xml b/testsrunner/org.eclipse.cdt.testsrunner.feature/feature.xml
index f2081dcd9ed..bff3a2ba59c 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
index fea6036f5cc..9664658d2e0 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.3.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.3.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.4.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.3.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/upc/org.eclipse.cdt.bupc-feature/feature.xml b/upc/org.eclipse.cdt.bupc-feature/feature.xml
index a46bbf3f50f..b04b2fea94e 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.3.0.qualifier"
+      version="9.4.0.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.core.parser.upc.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
index 054c4d0a8ec..d682854f715 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.3.0.qualifier"
+      version="9.4.0.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.sdk.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
index b9b63a8674c..b5b379b13a4 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.3.0.qualifier"
+      version="9.4.0.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/util/org.eclipse.cdt.util-feature/feature.xml b/util/org.eclipse.cdt.util-feature/feature.xml
index b6dd6cbbfc7..fb95ac0dc01 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.3.0.qualifier"
+      version="9.4.0.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
deleted file mode 100644
index b9757b81e60..00000000000
--- a/util/org.eclipse.cdt.util-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.cdt</groupId>
-		<artifactId>cdt-parent</artifactId>
-		<version>9.3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.cdt.features</groupId>
-	<version>9.3.0-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 3d7176f37fd..555d8a96cfc 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/windows/org.eclipse.cdt.msw-feature/feature.xml b/windows/org.eclipse.cdt.msw-feature/feature.xml
index 0f06aa7d3bf..1c485157ac4 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="Eclipse CDT"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/xlc/org.eclipse.cdt.xlc.feature/feature.xml b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
index 63322d7bcd7..b0aabafbe08 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.3.0.qualifier"
+      version="9.4.0.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.sdk-feature/feature.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
index 9cff840334f..6244366e0bb 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.3.0.qualifier"
+      version="9.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">