diff --git a/.mvn/maven.config b/.mvn/maven.config
index 7b87b66268..782e62a201 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1,3 +1,3 @@
--Dtycho.version=5.0.2
+-Dtycho.version=5.0.3
 -Djdk.xml.totalEntitySizeLimit=1000000
 -Djdk.xml.maxGeneralEntitySizeLimit=1000000
\ No newline at end of file
diff --git a/org.eclipse.wb.core.databinding.xsd/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.wb.core.databinding.xsd/.settings/org.eclipse.jdt.core.prefs
index 9ee4dca6b8..27636dce7b 100644
--- a/org.eclipse.wb.core.databinding.xsd/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.wb.core.databinding.xsd/.settings/org.eclipse.jdt.core.prefs
@@ -13,7 +13,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=21
diff --git a/org.eclipse.wb.core.feature_feature/feature.xml b/org.eclipse.wb.core.feature_feature/feature.xml
index 0c8fa3ad4e..f8c38d017c 100644
--- a/org.eclipse.wb.core.feature_feature/feature.xml
+++ b/org.eclipse.wb.core.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.core.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.core"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.core.java.feature_feature/feature.xml b/org.eclipse.wb.core.java.feature_feature/feature.xml
index 51a99f84ea..f0766411de 100644
--- a/org.eclipse.wb.core.java.feature_feature/feature.xml
+++ b/org.eclipse.wb.core.java.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.core.java.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.wb.core.java/.settings/.api_filters b/org.eclipse.wb.core.java/.settings/.api_filters
deleted file mode 100644
index d845b478a1..0000000000
--- a/org.eclipse.wb.core.java/.settings/.api_filters
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.wb.core.java" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="Restructuring of internal IEditPolicyListener" id="923795461">
-            <message_arguments>
-                <message_argument value="1.15.0"/>
-                <message_argument value="1.14.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/editor/palette/model/EntryInfo.java" type="org.eclipse.wb.core.editor.palette.model.EntryInfo">
-        <filter comment="Remove referencef to internal Tool class" id="336695337">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.EntryInfo"/>
-                <message_argument value="createTool(boolean)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Remove reference to internal Tool class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.EntryInfo"/>
-                <message_argument value="createTool(boolean)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/editor/palette/model/entry/ChooseComponentEntryInfo.java" type="org.eclipse.wb.core.editor.palette.model.entry.ChooseComponentEntryInfo">
-        <filter comment="Remove reference to internal Tool class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.entry.ChooseComponentEntryInfo"/>
-                <message_argument value="createTool()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/editor/palette/model/entry/ComponentEntryInfo.java" type="org.eclipse.wb.core.editor.palette.model.entry.ComponentEntryInfo">
-        <filter comment="Remove reference to internal Tool class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.entry.ComponentEntryInfo"/>
-                <message_argument value="createTool()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/editor/palette/model/entry/MarqueeSelectionToolEntryInfo.java" type="org.eclipse.wb.core.editor.palette.model.entry.MarqueeSelectionToolEntryInfo">
-        <filter comment="Remove reference to internal Tool class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.entry.MarqueeSelectionToolEntryInfo"/>
-                <message_argument value="createTool()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/editor/palette/model/entry/SelectionToolEntryInfo.java" type="org.eclipse.wb.core.editor.palette.model.entry.SelectionToolEntryInfo">
-        <filter comment="Remove reference to internal Tool class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.entry.SelectionToolEntryInfo"/>
-                <message_argument value="createTool()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/editor/palette/model/entry/TabOrderToolEntryInfo.java" type="org.eclipse.wb.core.editor.palette.model.entry.TabOrderToolEntryInfo">
-        <filter comment="Remove reference to internal Tool class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.entry.TabOrderToolEntryInfo"/>
-                <message_argument value="createTool()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/editor/palette/model/entry/ToolEntryInfo.java" type="org.eclipse.wb.core.editor.palette.model.entry.ToolEntryInfo">
-        <filter comment="Remove reference to internal Tool class" id="336695337">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.entry.ToolEntryInfo"/>
-                <message_argument value="createTool()"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Remove reference to internal Tool class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.entry.ToolEntryInfo"/>
-                <message_argument value="createTool()"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Remove reference to internal Tool class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.palette.model.entry.ToolEntryInfo"/>
-                <message_argument value="createTool(boolean)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.wb.core.ui.feature_feature/feature.xml b/org.eclipse.wb.core.ui.feature_feature/feature.xml
index 38e818b198..9d5e2b1b16 100644
--- a/org.eclipse.wb.core.ui.feature_feature/feature.xml
+++ b/org.eclipse.wb.core.ui.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.core.ui.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.core.ui"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.core/.settings/.api_filters b/org.eclipse.wb.core/.settings/.api_filters
index 759c2aea18..b037c15578 100644
--- a/org.eclipse.wb.core/.settings/.api_filters
+++ b/org.eclipse.wb.core/.settings/.api_filters
@@ -1,145 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.wb.core" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="Restructuring of internal IEditPolicyListener" id="923795461">
-            <message_arguments>
-                <message_argument value="1.24.0"/>
-                <message_argument value="1.23.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.wb.core.editor.constants.CoreImages">
-        <filter comment="Restructuring of internal CoreImages" id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.constants.CoreImages"/>
-                <message_argument value="org.eclipse.wb.core_1.24.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/controls/palette/PaletteComposite.java" type="org.eclipse.wb.core.controls.palette.PaletteComposite">
-        <filter comment="Removal of reference to internal Figure class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.controls.palette.PaletteComposite"/>
-                <message_argument value="getCategoryFigure(ICategory)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Removal of reference to internal Figure class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.controls.palette.PaletteComposite"/>
-                <message_argument value="getEntryFigure(DesignerContainer, DesignerEntry)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Removal of reference to internal Figure class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.controls.palette.PaletteComposite"/>
-                <message_argument value="getEntryFigure(ICategory, IEntry)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/gef/IEditPartConfigurator.java" type="org.eclipse.wb.core.gef.IEditPartConfigurator">
-        <filter comment="Restructuring of internal EditPart" id="403804204">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.IEditPartConfigurator"/>
-                <message_argument value="configure(EditPart, EditPart)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal EditPart" id="405901410">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.IEditPartConfigurator"/>
-                <message_argument value="configure(EditPart, EditPart)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/gef/MatchingEditPartFactory.java" type="org.eclipse.wb.core.gef.MatchingEditPartFactory">
-        <filter comment="Restructuring of internal EditPart" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.MatchingEditPartFactory"/>
-                <message_argument value="createEditPart(EditPart, Object)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/gef/part/menu/MenuEditPartFactory.java" type="org.eclipse.wb.core.gef.part.menu.MenuEditPartFactory">
-        <filter comment="Restructuring of internal EditPart" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.part.menu.MenuEditPartFactory"/>
-                <message_argument value="createMenu(Object, IMenuInfo)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal EditPart" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.part.menu.MenuEditPartFactory"/>
-                <message_argument value="createMenuItem(Object, IMenuItemInfo)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal EditPart" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.part.menu.MenuEditPartFactory"/>
-                <message_argument value="createMenuMac(Object, IMenuInfo)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal EditPart" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.part.menu.MenuEditPartFactory"/>
-                <message_argument value="createPopupMenu(Object, IMenuPopupInfo)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/core/gef/policy/PolicyUtils.java" type="org.eclipse.wb.core.gef.policy.PolicyUtils">
-        <filter comment="Removed reference to internal Border class" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.PolicyUtils"/>
-                <message_argument value="createTargetBorder()"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GraphicalEditPart" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.PolicyUtils"/>
-                <message_argument value="eraseBorderTargetFeedback(GraphicalEditPart)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GraphicalEditPolicy" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.PolicyUtils"/>
-                <message_argument value="eraseBorderTargetFeedback(GraphicalEditPolicy)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GraphicalEditPart" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.PolicyUtils"/>
-                <message_argument value="getAbsoluteBounds(GraphicalEditPart)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GraphicalEditPart" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.PolicyUtils"/>
-                <message_argument value="showBorderTargetFeedback(GraphicalEditPart)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GraphicalEditPolicy" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.PolicyUtils"/>
-                <message_argument value="showBorderTargetFeedback(GraphicalEditPolicy)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GraphicalEditPolicy" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.PolicyUtils"/>
-                <message_argument value="translateAbsoluteToFeedback(GraphicalEditPolicy, Translatable)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GraphicalEditPart" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.PolicyUtils"/>
-                <message_argument value="translateAbsoluteToModel(GraphicalEditPart, Translatable)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GraphicalEditPolicy" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.PolicyUtils"/>
-                <message_argument value="translateModelToFeedback(GraphicalEditPolicy, Translatable)"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="src/org/eclipse/wb/core/gef/policy/helpers/BroadcastListenerHelper.java" type="org.eclipse.wb.core.gef.policy.helpers.BroadcastListenerHelper">
         <filter comment="Method marked for removal" id="643846161">
             <message_arguments>
@@ -187,12 +47,6 @@
         </filter>
     </resource>
     <resource path="src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridHelper.java" type="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridHelper">
-        <filter comment="Restructuring of internal GraphicalEditPolicy" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridHelper"/>
-                <message_argument value="getHost()"/>
-            </message_arguments>
-        </filter>
         <filter comment="Constructor marked for removal" id="643850349">
             <message_arguments>
                 <message_argument value="GraphicalEditPolicy"/>
@@ -201,36 +55,4 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridSelectionEditPolicy.java" type="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy">
-        <filter comment="Restructuring of internal GEF Handler" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy"/>
-                <message_argument value="createSizeHandle(int, Locator)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GEF Handler" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy"/>
-                <message_argument value="createSizeHandle(int, double)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GEF Handler" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy"/>
-                <message_argument value="createSpanHandle(int, Locator)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Restructuring of internal GEF Handler" id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy"/>
-                <message_argument value="createSpanHandle(int, double)"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Removal of internal RectangleFigure" id="388161617">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy"/>
-                <message_argument value="m_lineFeedback"/>
-            </message_arguments>
-        </filter>
-    </resource>
 </component>
diff --git a/org.eclipse.wb.core/META-INF/MANIFEST.MF b/org.eclipse.wb.core/META-INF/MANIFEST.MF
index f2af83127c..f01c4fac8a 100644
--- a/org.eclipse.wb.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.wb.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wb.core;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.wb.internal.core.DesignerPlugin
diff --git a/org.eclipse.wb.dependencies.feature_feature/feature.xml b/org.eclipse.wb.dependencies.feature_feature/feature.xml
index e22cfd1f26..e3e4a3bea7 100644
--- a/org.eclipse.wb.dependencies.feature_feature/feature.xml
+++ b/org.eclipse.wb.dependencies.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.dependencies.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.wb.doc.user.feature_feature/feature.xml b/org.eclipse.wb.doc.user.feature_feature/feature.xml
index b3627a08d4..7312fcd8c1 100644
--- a/org.eclipse.wb.doc.user.feature_feature/feature.xml
+++ b/org.eclipse.wb.doc.user.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.doc.user.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.doc.user"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.doc.user/META-INF/MANIFEST.MF b/org.eclipse.wb.doc.user/META-INF/MANIFEST.MF
index aa853e9e7d..c64acde557 100644
--- a/org.eclipse.wb.doc.user/META-INF/MANIFEST.MF
+++ b/org.eclipse.wb.doc.user/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Automatic-Module-Name: org.eclipse.wb.doc.user
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wb.doc.user; singleton:=true
-Bundle-Version: 1.11.100.qualifier
+Bundle-Version: 1.11.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-21
diff --git a/org.eclipse.wb.doc.user/pom.xml b/org.eclipse.wb.doc.user/pom.xml
index 9e9cf2777d..2ee4506a1f 100644
--- a/org.eclipse.wb.doc.user/pom.xml
+++ b/org.eclipse.wb.doc.user/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.eclipse.wb.doc.user</artifactId>
-	<version>1.11.100-SNAPSHOT</version>
+	<version>1.11.200-SNAPSHOT</version>
 	<parent>
 		<groupId>org.eclipse.wb</groupId>
 		<artifactId>org.eclipse.wb.root</artifactId>
diff --git a/org.eclipse.wb.layout.group.feature_feature/feature.xml b/org.eclipse.wb.layout.group.feature_feature/feature.xml
index 9a2c807946..a359c43e3a 100644
--- a/org.eclipse.wb.layout.group.feature_feature/feature.xml
+++ b/org.eclipse.wb.layout.group.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.layout.group.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.layout.group"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.os.feature_feature/feature.xml b/org.eclipse.wb.os.feature_feature/feature.xml
index 3cabd10200..e06642ac33 100644
--- a/org.eclipse.wb.os.feature_feature/feature.xml
+++ b/org.eclipse.wb.os.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.os.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.wb.rcp.SWT_AWT_support_feature/feature.xml b/org.eclipse.wb.rcp.SWT_AWT_support_feature/feature.xml
index c9352ddd3f..db58217d4e 100644
--- a/org.eclipse.wb.rcp.SWT_AWT_support_feature/feature.xml
+++ b/org.eclipse.wb.rcp.SWT_AWT_support_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.rcp.SWT_AWT_support"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.rcp.SWT_AWT"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.rcp.doc.user.feature_feature/feature.xml b/org.eclipse.wb.rcp.doc.user.feature_feature/feature.xml
index e4b8b92469..d5a76f889b 100644
--- a/org.eclipse.wb.rcp.doc.user.feature_feature/feature.xml
+++ b/org.eclipse.wb.rcp.doc.user.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.rcp.doc.user.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.rcp.doc.user"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.rcp.doc.user/META-INF/MANIFEST.MF b/org.eclipse.wb.rcp.doc.user/META-INF/MANIFEST.MF
index ead46ef16a..bccd6e3666 100644
--- a/org.eclipse.wb.rcp.doc.user/META-INF/MANIFEST.MF
+++ b/org.eclipse.wb.rcp.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wb.rcp.doc.user;singleton:=true
-Bundle-Version: 1.9.800.qualifier
+Bundle-Version: 1.9.900.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.wb.rcp.doc.user/pom.xml b/org.eclipse.wb.rcp.doc.user/pom.xml
index 98349101d3..5d7d988e31 100644
--- a/org.eclipse.wb.rcp.doc.user/pom.xml
+++ b/org.eclipse.wb.rcp.doc.user/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.eclipse.wb.rcp.doc.user</artifactId>
-	<version>1.9.800-SNAPSHOT</version>
+	<version>1.9.900-SNAPSHOT</version>
 	<parent>
 		<groupId>org.eclipse.wb</groupId>
 		<artifactId>org.eclipse.wb.root</artifactId>
diff --git a/org.eclipse.wb.rcp.feature_feature/feature.xml b/org.eclipse.wb.rcp.feature_feature/feature.xml
index be3a7187d0..4a9d4c0485 100644
--- a/org.eclipse.wb.rcp.feature_feature/feature.xml
+++ b/org.eclipse.wb.rcp.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.rcp.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.rcp"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.swing.doc.user.feature_feature/feature.xml b/org.eclipse.wb.swing.doc.user.feature_feature/feature.xml
index b0f1d18915..349ab112c0 100644
--- a/org.eclipse.wb.swing.doc.user.feature_feature/feature.xml
+++ b/org.eclipse.wb.swing.doc.user.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.swing.doc.user.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.swing.doc.user"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.swing.doc.user/META-INF/MANIFEST.MF b/org.eclipse.wb.swing.doc.user/META-INF/MANIFEST.MF
index 1ceeecb624..20fa982394 100644
--- a/org.eclipse.wb.swing.doc.user/META-INF/MANIFEST.MF
+++ b/org.eclipse.wb.swing.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wb.swing.doc.user;singleton:=true
-Bundle-Version: 1.10.200.qualifier
+Bundle-Version: 1.10.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-21
diff --git a/org.eclipse.wb.swing.doc.user/pom.xml b/org.eclipse.wb.swing.doc.user/pom.xml
index 353a69c794..08757e5ea3 100644
--- a/org.eclipse.wb.swing.doc.user/pom.xml
+++ b/org.eclipse.wb.swing.doc.user/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.eclipse.wb.swing.doc.user</artifactId>
-	<version>1.10.200-SNAPSHOT</version>
+	<version>1.10.300-SNAPSHOT</version>
 	<parent>
 		<groupId>org.eclipse.wb</groupId>
 		<artifactId>org.eclipse.wb.root</artifactId>
diff --git a/org.eclipse.wb.swing.feature_feature/feature.xml b/org.eclipse.wb.swing.feature_feature/feature.xml
index 026acc18e6..d96d3dd532 100644
--- a/org.eclipse.wb.swing.feature_feature/feature.xml
+++ b/org.eclipse.wb.swing.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.swing.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.swing"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.swing/.settings/.api_filters b/org.eclipse.wb.swing/.settings/.api_filters
deleted file mode 100644
index 2ed2382230..0000000000
--- a/org.eclipse.wb.swing/.settings/.api_filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.wb.swing" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="Restructuring of internal SwingImages" id="923795461">
-            <message_arguments>
-                <message_argument value="1.12.0"/>
-                <message_argument value="1.11.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.wb.core.editor.constants.CoreImages">
-        <filter comment="Restructuring of internal CoreImages" id="305422471">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.core.editor.constants.CoreImages"/>
-                <message_argument value="org.eclipse.wb.swing_1.11.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.wb.swing.SwingImages">
-        <filter comment="Restructuring of internal SwingImages" id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.swing.SwingImages"/>
-                <message_argument value="org.eclipse.wb.swing_1.12.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.wb.swt.feature_feature/feature.xml b/org.eclipse.wb.swt.feature_feature/feature.xml
index 371bb958c8..75f166af37 100644
--- a/org.eclipse.wb.swt.feature_feature/feature.xml
+++ b/org.eclipse.wb.swt.feature_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wb.swt.feature"
       label="%featureName"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wb.swt"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.wb.swt/.settings/.api_filters b/org.eclipse.wb.swt/.settings/.api_filters
deleted file mode 100644
index b04f441c96..0000000000
--- a/org.eclipse.wb.swt/.settings/.api_filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.wb.swt" version="2">
-    <resource path="src/org/eclipse/wb/internal/swt/preferences/IPreferenceConstants.java" type="org.eclipse.wb.internal.swt.preferences.IPreferenceConstants">
-        <filter comment="Package is internal" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.internal.swt.preferences.IPreferenceConstants"/>
-                <message_argument value="org.eclipse.wb.swt_1.11.100"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/wb/internal/swt/preferences/PreferencesMessages.java" type="org.eclipse.wb.internal.swt.preferences.PreferencesMessages">
-        <filter comment="Package is internal" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.wb.internal.swt.preferences.PreferencesMessages"/>
-                <message_argument value="org.eclipse.wb.swt_1.11.100"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/pom.xml b/pom.xml
index ac1169ead1..f0db0f97ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <baseline.repo>https://download.eclipse.org/releases/2026-03</baseline.repo>
-    <eclipse.repo>https://download.eclipse.org/releases/2026-06</eclipse.repo>
+    <baseline.repo>https://download.eclipse.org/releases/2026-06</baseline.repo>
+    <eclipse.repo>https://download.eclipse.org/releases/2026-09</eclipse.repo>
     <tycho.sbom.url>${eclipse.repo}</tycho.sbom.url>
     <target-platform>${maven.multiModuleProjectDirectory}/target-platform/wb.target</target-platform>
   </properties>
@@ -149,13 +149,13 @@
         <plugin>
           <groupId>org.asciidoctor</groupId>
           <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>2.2.6</version>
+          <version>3.2.0</version>
           <dependencies>
             <!-- Required for source-code highlighting -->
             <dependency>
               <groupId>org.jruby</groupId>
               <artifactId>jruby</artifactId>
-              <version>9.4.8.0</version>
+              <version>9.4.15.0</version>
             </dependency>
           </dependencies>
           <configuration>
diff --git a/target-platform/baseline-2026-06.target b/target-platform/baseline-2026-06.target
new file mode 100644
index 0000000000..45a7a29566
--- /dev/null
+++ b/target-platform/baseline-2026-06.target
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Baseline 2026-06">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/releases/2026-06/"/>
+			<unit id="org.eclipse.wb.core.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.wb.core.java.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.wb.core.ui.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.wb.layout.group.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.wb.rcp.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.wb.rcp.SWT_AWT_support.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.wb.swing.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.wb.swt.feature.feature.group" version="0.0.0"/>
+		</location>
+	</locations>
+</target>
\ No newline at end of file
diff --git a/target-platform/wb.target b/target-platform/wb.target
index 169ac69588..931cb305f9 100644
--- a/target-platform/wb.target
+++ b/target-platform/wb.target
@@ -7,7 +7,7 @@
 			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/staging/2026-06/"/>
+			<repository location="https://download.eclipse.org/staging/2026-09/"/>
 			<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
@@ -21,7 +21,7 @@
 		</location>
 		<location type="Target" uri="file:${project_loc:/target-platform}/mvn/wb-mvn.target"/>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026-06"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026-09"/>
 			<unit id="assertj-core" version="0.0.0"/>
 			<unit id="com.jgoodies.common" version="0.0.0"/>
 			<unit id="com.jgoodies.forms" version="0.0.0"/>