diff --git a/TraceCompass.setup b/TraceCompass.setup
index eafb660726..09a614b84f 100644
--- a/TraceCompass.setup
+++ b/TraceCompass.setup
@@ -75,7 +75,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="tracecompass-e4.36"
+      defaultValue="tracecompass-e4.37"
       storageURI="scope://Workspace"
       label="Target Platform">
     <choice
@@ -129,6 +129,9 @@
     <choice
         value="tracecompass-e4.36"
         label="Trace Compass Eclipse 2025-06 - 4.36"/>
+    <choice
+        value="tracecompass-e4.37"
+        label="Trace Compass Eclipse 2025-06 - 4.37"/>
     <choice
         value="tracecompass-eStaging"
         label="Trace Compass Eclipse Latest"/>
@@ -166,15 +169,15 @@
     <setupTask
         xsi:type="pde:TargetPlatformTask"
         id="tracecompass-baseline-resolve"
-        name="tracecompass-baseline-11.0.0"
+        name="tracecompass-baseline-11.1.0"
         activate="false">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask
         xsi:type="pde:APIBaselineFromTargetTask"
-        id="tracecompass-baseline-11.0.0"
+        id="tracecompass-baseline-11.1.0"
         name="Trace Compass Baseline"
-        targetName="tracecompass-baseline-11.0.0">
+        targetName="tracecompass-baseline-11.1.0">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask
diff --git a/pom.xml b/pom.xml
index 44c4465d5b..b5a2035650 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.36</target-platform>
+    <target-platform>tracecompass-e4.37</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 2b22819460..415d6e8ba2 100644
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -385,10 +385,6 @@
          id="org.eclipse.jetty.ee8.security"
          version="0.0.0"/>
 
-   <plugin
-         id="com.sun.el.javax.el"
-         version="0.0.0"/>
-
    <plugin
          id="com.ibm.icu"
          version="0.0.0"/>
diff --git a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.36/feature.xml
similarity index 99%
rename from rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
rename to rcp/org.eclipse.tracecompass.rcp/legacy-e4.36/feature.xml
index 415d6e8ba2..2b22819460 100644
--- a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.36/feature.xml
@@ -385,6 +385,10 @@
          id="org.eclipse.jetty.ee8.security"
          version="0.0.0"/>
 
+   <plugin
+         id="com.sun.el.javax.el"
+         version="0.0.0"/>
+
    <plugin
          id="com.ibm.icu"
          version="0.0.0"/>
diff --git a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.0.0.target b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.1.0.target
similarity index 97%
rename from releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.0.0.target
rename to releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.1.0.target
index 33f5011980..03ffc45c52 100644
--- a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.0.0.target
+++ b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.1.0.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="tracecompass-baseline-11.0.0" sequenceNumber="1">
+<?pde version="3.8"?><target name="tracecompass-baseline-11.1.0" sequenceNumber="1">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.analysis.counters.core" version="0.0.0"/>
@@ -46,11 +46,11 @@
 <unit id="org.eclipse.tracecompass.tmf.remote.core" version="0.0.0"/>
 <unit id="org.eclipse.tracecompass.tmf.remote.ui" version="0.0.0"/>
 <unit id="org.eclipse.tracecompass.tmf.ui" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tracecompass/releases/11.0.0/repository/"/>
+<repository location="http://download.eclipse.org/tracecompass/releases/11.1.0/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.core.runtime" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2025-06"/>
+<repository location="http://download.eclipse.org/releases/2025-09"/>
 </location>
 </locations>
 </target>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.37.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.37.target
index b22b117af6..a507df57a8 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.37.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.37.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.37" sequenceNumber="3">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.37" sequenceNumber="4">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.6/"/>
@@ -11,7 +11,7 @@
 <unit id="org.eclipse.remote.ui" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/builds/12.2/cdt-12.2.0-m3/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/12.2/cdt-12.2.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -72,7 +72,7 @@
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
 <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
 <unit id="org.eclipse.osgi.services" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.37-I-builds/I20250820-1800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.37/R-4.37-202509050730/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -82,7 +82,7 @@
 <unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
 <unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
 <unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
-<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.39.0/S-3.39RC1-20250825070829/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.39.0/R-3.39.0-20250902093744/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
index d07ee31037..c808a854dd 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="258">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="259">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.6/"/>
@@ -11,7 +11,7 @@
 <unit id="org.eclipse.remote.ui" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/builds/12.2/cdt-12.2.0-m3/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/12.2/cdt-12.2.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -72,7 +72,7 @@
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
 <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
 <unit id="org.eclipse.osgi.services" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.37-I-builds/I20250820-1800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.37/R-4.37-202509050730/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -82,7 +82,7 @@
 <unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
 <unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
 <unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
-<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.39.0/S-3.39RC1-20250825070829/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.39.0/R-3.39.0-20250902093744/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF b/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF
index 716cb1ba4b..c5da23c203 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF
+++ b/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 10.1.0.qualifier
+Bundle-Version: 10.2.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.tmf.core;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.tmf.core.Activator
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/IAnalysisModule.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/IAnalysisModule.java
index 0c53b0da94..9360a7195f 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/IAnalysisModule.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/IAnalysisModule.java
@@ -290,7 +290,7 @@ default void fail(@NonNull Throwable cause) {
      * Gets the error cause in case of failure
      *
      * @return the error cause
-     * @since 10.1
+     * @since 10.2
      */
     default @Nullable Throwable getFailureCause() {
         return null;
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/exceptions/TmfAnalysisException.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/exceptions/TmfAnalysisException.java
index 174d06281f..5714742a5c 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/exceptions/TmfAnalysisException.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/exceptions/TmfAnalysisException.java
@@ -61,7 +61,7 @@ public TmfAnalysisException(Throwable cause) {
      *
      * @param cause
      *            The cause
-     * @since 10.1
+     * @since 10.2
      */
     public TmfAnalysisException(String message, Throwable cause) {
         super(message, cause);
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/CommonStatusMessage.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/CommonStatusMessage.java
index ff310e0a5d..9e3174db48 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/CommonStatusMessage.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/CommonStatusMessage.java
@@ -58,7 +58,7 @@ public final class CommonStatusMessage {
      * A possible detailed message for a
      * {@link org.eclipse.tracecompass.tmf.core.response.ITmfResponse.Status#FAILED}
      * status with error cause for failed analysis execution
-     * @since 10.1
+     * @since 10.2
      */
     public static final String ANALYSIS_EXECUTION_FAILED = Objects.requireNonNull(Messages.CommonStatusMessage_AnalysisExecutionFailed);
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/ITableColumnDescriptor.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/ITableColumnDescriptor.java
index b11bc69b79..3442bd25c0 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/ITableColumnDescriptor.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/ITableColumnDescriptor.java
@@ -26,7 +26,7 @@ public interface ITableColumnDescriptor {
      * is returned.
      *
      * @return the id of the column, or -1 if unused
-     * @since 10.1
+     * @since 10.2
      */
     default long getId() {
         return -1L;
@@ -60,7 +60,7 @@ default DataType getDataType() {
      * Returns {@code true} if the column should be hidden by default
      *
      * @return {@code true} if the column should be hidden by default
-     * @since 10.1
+     * @since 10.2
      */
     default boolean isHiddenByDefault() {
         return false;
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/Messages.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/Messages.java
index 7c148cc229..f584797dc9 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/Messages.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/Messages.java
@@ -45,7 +45,7 @@ public class Messages extends NLS {
 
     /**
      * Detailed message for failed status cause by an analysis initialization failure
-     * @since 10.1
+     * @since 10.2
      */
     public static @Nullable String CommonStatusMessage_AnalysisExecutionFailed;