diff --git a/pom.xml b/pom.xml
index 3c145d7a80..44c4465d5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <tycho-use-project-settings>true</tycho-use-project-settings>
     <tycho.scmUrl>scm:git:https://github.com/eclipse-tracecompass/org.eclipse.tracecompass</tycho.scmUrl>
     <cbi-plugins.version>1.4.2</cbi-plugins.version>
-    <target-platform>tracecompass-e4.35</target-platform>
+    <target-platform>tracecompass-e4.36</target-platform>
     <help-docs-eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.23</help-docs-eclipserun-repo>
 
     <rcptt-version>2.5.4</rcptt-version>
diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index 8f704f05d2..e6750610c5 100644
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -237,10 +237,6 @@
          id="org.apache.felix.scr"
          version="0.0.0"/>
 
-   <plugin
-         id="org.apache.commons.jxpath"
-         version="0.0.0"/>
-
    <plugin
          id="com.sun.jna"
          version="0.0.0"/>
@@ -294,7 +290,7 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.apache.commons.logging"
+         id="org.apache.commons.commons-logging"
          version="0.0.0"/>
 
    <plugin
@@ -442,23 +438,11 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.apache.commons.jxpath"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.commons.commons-beanutils"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.commons.collections"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.jdom"
+         id="org.eclipse.launchbar.core"
          version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.launchbar.core"
+         id="com.github.weisj.jsvg"
          version="0.0.0"/>
 
    <plugin
diff --git a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.35/feature.xml
similarity index 95%
rename from rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
rename to rcp/org.eclipse.tracecompass.rcp/legacy-e4.35/feature.xml
index e6750610c5..8f704f05d2 100644
--- a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.35/feature.xml
@@ -237,6 +237,10 @@
          id="org.apache.felix.scr"
          version="0.0.0"/>
 
+   <plugin
+         id="org.apache.commons.jxpath"
+         version="0.0.0"/>
+
    <plugin
          id="com.sun.jna"
          version="0.0.0"/>
@@ -290,7 +294,7 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.apache.commons.commons-logging"
+         id="org.apache.commons.logging"
          version="0.0.0"/>
 
    <plugin
@@ -438,11 +442,23 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.launchbar.core"
+         id="org.apache.commons.jxpath"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.apache.commons.commons-beanutils"
          version="0.0.0"/>
 
    <plugin
-         id="com.github.weisj.jsvg"
+         id="org.apache.commons.collections"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jdom"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.launchbar.core"
          version="0.0.0"/>
 
    <plugin