diff --git a/build/org.eclipse.cdt.autotools-feature/feature.xml b/build/org.eclipse.cdt.autotools-feature/feature.xml
index 5d479e3e093..c73c600ae6a 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%provider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml
index 63e41a98b77..05eb961fbff 100644
--- a/build/org.eclipse.cdt.autotools.docs/pom.xml
+++ b/build/org.eclipse.cdt.autotools.docs/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.cdt</groupId>
     <artifactId>cdt-parent</artifactId>
-    <version>9.8.1-SNAPSHOT</version>
+    <version>9.8.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/build/org.eclipse.cdt.cmake-feature/feature.xml b/build/org.eclipse.cdt.cmake-feature/feature.xml
index 1c386828808..34530231c2a 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/build/org.eclipse.cdt.cmake.ui.tests/pom.xml b/build/org.eclipse.cdt.cmake.ui.tests/pom.xml
index 02eb2add8b1..87d1afdbf31 100644
--- a/build/org.eclipse.cdt.cmake.ui.tests/pom.xml
+++ b/build/org.eclipse.cdt.cmake.ui.tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/build/org.eclipse.cdt.core.autotools-feature/feature.xml b/build/org.eclipse.cdt.core.autotools-feature/feature.xml
index af69c9cd745..2ffd046edfb 100644
--- a/build/org.eclipse.cdt.core.autotools-feature/feature.xml
+++ b/build/org.eclipse.cdt.core.autotools-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.core.autotools"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.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 06a6b0fdd17..a1d51c238c1 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/build/org.eclipse.cdt.meson-feature/feature.xml b/build/org.eclipse.cdt.meson-feature/feature.xml
index bad78e1935c..9a38bca0abc 100644
--- a/build/org.eclipse.cdt.meson-feature/feature.xml
+++ b/build/org.eclipse.cdt.meson-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.meson"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/build/org.eclipse.cdt.meson.docs/pom.xml b/build/org.eclipse.cdt.meson.docs/pom.xml
index 056f984de88..07e17b974c6 100644
--- a/build/org.eclipse.cdt.meson.docs/pom.xml
+++ b/build/org.eclipse.cdt.meson.docs/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.cdt</groupId>
     <artifactId>cdt-parent</artifactId>
-    <version>9.8.1-SNAPSHOT</version>
+    <version>9.8.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/build/org.eclipse.cdt.meson.ui.tests/pom.xml b/build/org.eclipse.cdt.meson.ui.tests/pom.xml
index 78c48bdebd0..4c803dd49d0 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/pom.xml
+++ b/build/org.eclipse.cdt.meson.ui.tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/build/pom.xml b/build/pom.xml
index 187ab518c48..daef33e37c7 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.build-parent</artifactId>
diff --git a/codan/pom.xml b/codan/pom.xml
index 70b375b355c..0335131970d 100644
--- a/codan/pom.xml
+++ b/codan/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.codan-parent</artifactId>
diff --git a/core/org.eclipse.cdt.core.linux.ppc64le/pom.xml b/core/org.eclipse.cdt.core.linux.ppc64le/pom.xml
index ac260e2acfd..9787684a018 100644
--- a/core/org.eclipse.cdt.core.linux.ppc64le/pom.xml
+++ b/core/org.eclipse.cdt.core.linux.ppc64le/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/pom.xml b/core/org.eclipse.cdt.core.linux.x86_64/pom.xml
index 9785d27052c..5183f47a7f4 100644
--- a/core/org.eclipse.cdt.core.linux.x86_64/pom.xml
+++ b/core/org.eclipse.cdt.core.linux.x86_64/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/core/org.eclipse.cdt.core.linux/pom.xml b/core/org.eclipse.cdt.core.linux/pom.xml
index 50002ce9ebc..6e00704b845 100644
--- a/core/org.eclipse.cdt.core.linux/pom.xml
+++ b/core/org.eclipse.cdt.core.linux/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.cdt</groupId>
     <artifactId>cdt-parent</artifactId>
-    <version>9.8.1-SNAPSHOT</version>
+    <version>9.8.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/core/org.eclipse.cdt.core.macosx/pom.xml b/core/org.eclipse.cdt.core.macosx/pom.xml
index 1084fe3d93c..58e19383e05 100644
--- a/core/org.eclipse.cdt.core.macosx/pom.xml
+++ b/core/org.eclipse.cdt.core.macosx/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index 391110731ef..f005dd9e075 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/core/org.eclipse.cdt.core.win32.x86_64/pom.xml b/core/org.eclipse.cdt.core.win32.x86_64/pom.xml
index 512e6ffabd7..f01f09ed8b0 100644
--- a/core/org.eclipse.cdt.core.win32.x86_64/pom.xml
+++ b/core/org.eclipse.cdt.core.win32.x86_64/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/core/org.eclipse.cdt.core.win32/pom.xml b/core/org.eclipse.cdt.core.win32/pom.xml
index bf1a89add78..5a3274e8733 100644
--- a/core/org.eclipse.cdt.core.win32/pom.xml
+++ b/core/org.eclipse.cdt.core.win32/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml
index 2017aa22214..84eb0b167c5 100644
--- a/core/org.eclipse.cdt.ui.tests/pom.xml
+++ b/core/org.eclipse.cdt.ui.tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/core/pom.xml b/core/pom.xml
index a1a389aa74a..a5b024531a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt-parent</artifactId>
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml
index 6c9b2a1b2fd..a3c7e8aa8f8 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.build.crossgcc"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.build.crossgcc"
       license-feature="org.eclipse.license"
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
index 3b03f555682..479b1fed1a3 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index 20c54cdbd38..219bc7d2bf9 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.8.1.qualifier"
+      version="9.8.2.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 33590ac9f25..17af018ebe6 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/cross/org.eclipse.cdt.launch.serial-feature/feature.xml b/cross/org.eclipse.cdt.launch.serial-feature/feature.xml
index 7fdb924b862..e34030820e6 100644
--- a/cross/org.eclipse.cdt.launch.serial-feature/feature.xml
+++ b/cross/org.eclipse.cdt.launch.serial-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.launch.serial.feature"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/cross/pom.xml b/cross/pom.xml
index 63aff4845eb..a9b1f1d1dca 100644
--- a/cross/pom.xml
+++ b/cross/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.cross-parent</artifactId>
diff --git a/debug/org.eclipse.cdt.debug.application.doc/pom.xml b/debug/org.eclipse.cdt.debug.application.doc/pom.xml
index 8a2acf996da..23a3c80f306 100644
--- a/debug/org.eclipse.cdt.debug.application.doc/pom.xml
+++ b/debug/org.eclipse.cdt.debug.application.doc/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index c4fa7e8540a..a4b5a5374f8 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.8.1.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.8.2.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 ebd9adca943..34ff26a0368 100644
--- a/debug/org.eclipse.cdt.debug.application.product/pom.xml
+++ b/debug/org.eclipse.cdt.debug.application.product/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/debug/org.eclipse.cdt.debug.application.tests/pom.xml b/debug/org.eclipse.cdt.debug.application.tests/pom.xml
index 2828b75210f..141cde1fbac 100644
--- a/debug/org.eclipse.cdt.debug.application.tests/pom.xml
+++ b/debug/org.eclipse.cdt.debug.application.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.cdt</groupId>
     <artifactId>cdt-parent</artifactId>
-    <version>9.8.1-SNAPSHOT</version>
+    <version>9.8.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF
index 14972dfdf51..1271c8be810 100644
--- a/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.cdt.debug.application;singleton:=true
-Bundle-Version: 1.1.201.qualifier
+Bundle-Version: 1.1.202.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.application.Activator
 Bundle-Vendor: %provider
 Require-Bundle: org.eclipse.ui,
diff --git a/debug/org.eclipse.cdt.debug.application/plugin.properties b/debug/org.eclipse.cdt.debug.application/plugin.properties
index 5374b51e999..c225e23410e 100644
--- a/debug/org.eclipse.cdt.debug.application/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.application/plugin.properties
@@ -41,6 +41,6 @@ DebugRemoteExecutableMenu.label=&Remote Executable...
 DebugCore.description=Debug a corefile
 DebugCore.name=Debug Core File
 DebugCoreMenu.label=Debug &Core File...
-aboutText=Eclipse Stand-alone C/C++ GDB Graphical Debugger\n\nRelease 9.8.1\n
+aboutText=Eclipse Stand-alone C/C++ GDB Graphical Debugger\n\nRelease 9.8.2\n
 ProductDesc=Eclipse Stand-alone C/C++ GDB Debugger
 ProductName=Stand-alone C/C++ GDB Debugger
diff --git a/debug/org.eclipse.cdt.debug.application/pom.xml b/debug/org.eclipse.cdt.debug.application/pom.xml
index 9ba265d9582..4ead653773b 100644
--- a/debug/org.eclipse.cdt.debug.application/pom.xml
+++ b/debug/org.eclipse.cdt.debug.application/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>org.eclipse.cdt.debug-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
-	<version>1.1.201-SNAPSHOT</version>
+	<version>1.1.202-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.debug.application</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
diff --git a/debug/org.eclipse.cdt.debug.standalone-feature/feature.xml b/debug/org.eclipse.cdt.debug.standalone-feature/feature.xml
index 514bc635f90..9187d498a6b 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.8.1.qualifier"
+      version="9.8.2.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 705f8918d6a..d9f8f184fbb 100644
--- a/debug/org.eclipse.cdt.gdb-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gdb-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gdb"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.gdb"
       license-feature="org.eclipse.license"
diff --git a/debug/org.eclipse.cdt.gdb-feature/pom.xml b/debug/org.eclipse.cdt.gdb-feature/pom.xml
index b31befdf2f7..7eef5209caa 100644
--- a/debug/org.eclipse.cdt.gdb-feature/pom.xml
+++ b/debug/org.eclipse.cdt.gdb-feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
index 4bbc12f8768..9dcc79148d8 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/debug/pom.xml b/debug/pom.xml
index 19afda498a7..14df9349a5b 100644
--- a/debug/pom.xml
+++ b/debug/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.debug-parent</artifactId>
diff --git a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
index 90181914062..5112bc64c68 100644
--- a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.doc.isv; singleton:=true
-Bundle-Version: 5.4.101.qualifier
+Bundle-Version: 5.4.102.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions b/doc/org.eclipse.cdt.doc.isv/cdtOptions
index 210e4f915b8..14163d884cd 100644
--- a/doc/org.eclipse.cdt.doc.isv/cdtOptions
+++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions
@@ -7,7 +7,7 @@
 -splitIndex
 -windowtitle "Eclipse CDT API Specification"
 -doctitle "Eclipse CDT API Specification"
--header "<strong>Eclipse CDT</strong><br>8.8.1"
+-header "<strong>Eclipse CDT</strong><br>9.8.2"
 -bottom "Copyright (c) IBM Corp. and others 2004, 2019.  All Rights Reserved."
 -group "C/C++ Development Tools Core Plug-in Packages" "org.eclipse.cdt.core:org.eclipse.cdt.core.*"
 -group "C/C++ Development Tools Debug Core Plug-in Packages" "org.eclipse.cdt.debug.core:org.eclipse.cdt.debug.core.*"
diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
index f148704c58e..212cc3af301 100644
--- a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
+++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
@@ -7,7 +7,7 @@
 -splitIndex
 -windowtitle "Eclipse CDT API Specification"
 -doctitle "Eclipse CDT API Specification"
--header "<strong>Eclipse CDT</strong><br>8.8.1"
+-header "<strong>Eclipse CDT</strong><br>9.8.2"
 -bottom "Copyright (c) IBM Corp. and others 2004, 2019.  All Rights Reserved."
 -group "C/C++ Development Tools Core Plug-in Packages" "org.eclipse.cdt.core;org.eclipse.cdt.core.*"
 -group "C/C++ Development Tools Debug Core Plug-in Packages" "org.eclipse.cdt.debug.core;org.eclipse.cdt.debug.core.*"
diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml
index 09e04ea82df..b2c49f6d048 100644
--- a/doc/org.eclipse.cdt.doc.isv/pom.xml
+++ b/doc/org.eclipse.cdt.doc.isv/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>5.4.101-SNAPSHOT</version>
+	<version>5.4.102-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.doc.isv</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml
index 46afe86da86..82cbbb9d637 100644
--- a/doc/org.eclipse.cdt.doc.user/pom.xml
+++ b/doc/org.eclipse.cdt.doc.user/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
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 b364979c9c3..60ec316a328 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.8.1.qualifier"
+      version="9.8.2.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 dc465fa2a82..fc06bc360d2 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
index bae6f4e3193..826a61e5bee 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/dsf-gdb/pom.xml b/dsf-gdb/pom.xml
index 55baeb6c08a..afbc8686c42 100644
--- a/dsf-gdb/pom.xml
+++ b/dsf-gdb/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.dsf-gdb-parent</artifactId>
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
index 99ad7c58da9..14625b10bfa 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.examples.dsf"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.examples.dsf"
       license-feature="org.eclipse.license"
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
index f3abae9f8c6..4daaba8bc64 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/dsf/pom.xml b/dsf/pom.xml
index b20a54ddfda..1d90c9bdf6a 100644
--- a/dsf/pom.xml
+++ b/dsf/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.dsf-parent</artifactId>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
index 263a07766d5..87a8c77b1ae 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.8.1.qualifier"
+      version="9.8.2.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 e03cf297307..1f51fe5372d 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
index 229bb91b80b..e052833acdf 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/jtag/pom.xml b/jtag/pom.xml
index 724634ed327..024083b74a9 100644
--- a/jtag/pom.xml
+++ b/jtag/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.cdt</groupId>
     <artifactId>cdt-parent</artifactId>
-    <version>9.8.1-SNAPSHOT</version>
+    <version>9.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.cdt.jtag-parent</artifactId>
diff --git a/launch/org.eclipse.cdt.docker.launcher-feature/feature.xml b/launch/org.eclipse.cdt.docker.launcher-feature/feature.xml
index 45ce545af8d..bbfd96293bb 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.8.1.qualifier"
+      version="9.8.2.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 298a7418409..53a071eddf6 100644
--- a/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml
+++ b/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml
@@ -7,7 +7,7 @@
         <parent>
                 <groupId>org.eclipse.cdt</groupId>
                 <artifactId>cdt-parent</artifactId>
-                <version>9.8.1-SNAPSHOT</version>
+                <version>9.8.2-SNAPSHOT</version>
                 <relativePath>../../pom.xml</relativePath>
         </parent>
 
diff --git a/launch/pom.xml b/launch/pom.xml
index a7fcd0d5724..841cf4eb59a 100644
--- a/launch/pom.xml
+++ b/launch/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.launch-parent</artifactId>
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 3da78f6b5dd..6ed1100444f 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="9.8.1.qualifier"
+      version="9.8.2.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 aef7ca5ad80..4249564bc43 100644
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/feature.xml
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.managedbuilder.llvm"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.managedbuilder.llvm.ui"
       license-feature="org.eclipse.license"
diff --git a/llvm/pom.xml b/llvm/pom.xml
index 2b16ba6b806..cd7cf2085e2 100644
--- a/llvm/pom.xml
+++ b/llvm/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.llvm-parent</artifactId>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
index a2d367000bf..d5f85dee0b3 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.core.lrparser.feature"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.core.lrparser"
       license-feature="org.eclipse.license"
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 9a2c1a9f624..df33dc739f0 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.core.lrparser.sdk"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.core.lrparser.source"
       license-feature="org.eclipse.license"
diff --git a/lrparser/pom.xml b/lrparser/pom.xml
index 191cfc59ed9..9d3825f54d5 100644
--- a/lrparser/pom.xml
+++ b/lrparser/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.lrparser-parent</artifactId>
diff --git a/lsp/org.eclipse.cdt.lsp-feature/feature.xml b/lsp/org.eclipse.cdt.lsp-feature/feature.xml
index 00a9eea06e5..e0fde2cf028 100644
--- a/lsp/org.eclipse.cdt.lsp-feature/feature.xml
+++ b/lsp/org.eclipse.cdt.lsp-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.lsp"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%featureProvider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml b/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml
index 6c6ea4c4c79..baf0639872f 100644
--- a/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml
+++ b/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/lsp/pom.xml b/lsp/pom.xml
index 93416ff25c5..7be7925786d 100644
--- a/lsp/pom.xml
+++ b/lsp/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.lsp-parent</artifactId>
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 4f085e1ca98..fa19340051b 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/memory/pom.xml b/memory/pom.xml
index fc7171fd367..262fbfbb717 100644
--- a/memory/pom.xml
+++ b/memory/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.memory-parent</artifactId>
diff --git a/native/org.eclipse.cdt.native.serial/pom.xml b/native/org.eclipse.cdt.native.serial/pom.xml
index de06475e5b6..ca01a7c8695 100644
--- a/native/org.eclipse.cdt.native.serial/pom.xml
+++ b/native/org.eclipse.cdt.native.serial/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.cdt</groupId>
     <artifactId>cdt-parent</artifactId>
-    <version>9.8.1-SNAPSHOT</version>
+    <version>9.8.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/native/pom.xml b/native/pom.xml
index 1c2538886c9..85b8f91e455 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.native-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index d25e2cae423..f08a72dcedd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.eclipse.cdt</groupId>
 	<artifactId>cdt-parent</artifactId>
-	<version>9.8.1-SNAPSHOT</version>
+	<version>9.8.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>CDT Parent</name>
 
@@ -35,7 +35,7 @@
 
 		     To set all the settings in one go to skip, use the skip-baseline profile
 	    -->
-		<comparator.repo>https://download.eclipse.org/tools/cdt/releases/9.8/cdt-9.8.0/</comparator.repo>
+		<comparator.repo>https://download.eclipse.org/tools/cdt/releases/9.8/cdt-9.8.1/</comparator.repo>
 		<compare-version-with-baselines.skip>false</compare-version-with-baselines.skip>
 		<replace-version-with-baselines.mode>fail</replace-version-with-baselines.mode>
 		<replace-version-with-baselines.replace>all</replace-version-with-baselines.replace>
diff --git a/qt/org.eclipse.cdt.qt-feature/feature.xml b/qt/org.eclipse.cdt.qt-feature/feature.xml
index e5a3dbf0ba8..17a756d87d1 100644
--- a/qt/org.eclipse.cdt.qt-feature/feature.xml
+++ b/qt/org.eclipse.cdt.qt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.qt"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/qt/pom.xml b/qt/pom.xml
index 4fb44a23f95..7acc3ff3362 100644
--- a/qt/pom.xml
+++ b/qt/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.qt-parent</artifactId>
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index 0853b3bb833..c2a1fbda84a 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.8.1.qualifier"
+      version="9.8.2.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 6764b7f6407..3d22f32f264 100644
--- a/releng/org.eclipse.cdt-feature/pom.xml
+++ b/releng/org.eclipse.cdt-feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/releng/org.eclipse.cdt.native-feature/feature.xml b/releng/org.eclipse.cdt.native-feature/feature.xml
index 1a6489f0d41..7bfa217b2e4 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.8.1.qualifier"
+      version="9.8.2.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 30216b6496d..31ceb3470e7 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.cdt.repo/pom.xml b/releng/org.eclipse.cdt.repo/pom.xml
index 27b4b0c079a..b29c4dd024c 100644
--- a/releng/org.eclipse.cdt.repo/pom.xml
+++ b/releng/org.eclipse.cdt.repo/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 82793eadaae..07ca16f441f 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.8.1.qualifier"
+      version="9.8.2.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 8ba1b592cd3..bfddf9d79ee 100644
--- a/releng/org.eclipse.cdt.sdk-feature/pom.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF
index 067a2b22891..f500870cd3c 100644
--- a/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.sdk;singleton:=true
-Bundle-Version: 9.8.1.qualifier
+Bundle-Version: 9.8.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/releng/org.eclipse.cdt.target/pom.xml b/releng/org.eclipse.cdt.target/pom.xml
index e3d68809d85..738427014bd 100644
--- a/releng/org.eclipse.cdt.target/pom.xml
+++ b/releng/org.eclipse.cdt.target/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index b932307a9ea..f0009975383 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.8.1.qualifier"
+      version="9.8.2.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 871066c2b0a..865d78d8aad 100644
--- a/releng/org.eclipse.cdt.testing-feature/pom.xml
+++ b/releng/org.eclipse.cdt.testing-feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/releng/org.eclipse.cdt.testing.repo/pom.xml b/releng/org.eclipse.cdt.testing.repo/pom.xml
index 1cd55c51971..f589a27cb37 100644
--- a/releng/org.eclipse.cdt.testing.repo/pom.xml
+++ b/releng/org.eclipse.cdt.testing.repo/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/releng/org.eclipse.cdt.testing/pom.xml b/releng/org.eclipse.cdt.testing/pom.xml
index 9f2db532162..cd219abb899 100644
--- a/releng/org.eclipse.cdt.testing/pom.xml
+++ b/releng/org.eclipse.cdt.testing/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/releng/org.eclipse.cdt/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
index 36f2162b1f7..bb3d2413e13 100644
--- a/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt; singleton:=true
-Bundle-Version: 9.8.1.qualifier
+Bundle-Version: 9.8.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui.intro;bundle-version="[3.2.0,4.0.0)",
diff --git a/releng/org.eclipse.cdt/pom.xml b/releng/org.eclipse.cdt/pom.xml
index 3be8c6075da..67fc011a211 100644
--- a/releng/org.eclipse.cdt/pom.xml
+++ b/releng/org.eclipse.cdt/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>9.8.1-SNAPSHOT</version>
+	<version>9.8.2-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
diff --git a/releng/pom.xml b/releng/pom.xml
index 7bcf2fcbf05..dc8500ba9e1 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.releng-parent</artifactId>
diff --git a/remote/pom.xml b/remote/pom.xml
index 08a94be0f3f..d813b4a8b6a 100644
--- a/remote/pom.xml
+++ b/remote/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.remote-parent</artifactId>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.feature/feature.xml b/testsrunner/org.eclipse.cdt.testsrunner.feature/feature.xml
index 7aa6f641db4..4924e824042 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/testsrunner/pom.xml b/testsrunner/pom.xml
index 4dc453467fb..cf5480b403a 100644
--- a/testsrunner/pom.xml
+++ b/testsrunner/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.testsrunner-parent</artifactId>
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
index f95d4337cc5..a852dbb4113 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
+++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.arduino"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.arduino.ui"
       license-feature="org.eclipse.license"
@@ -25,7 +25,7 @@
       <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.8.1"/>
+      <import feature="org.eclipse.cdt" version="9.8.2"/>
       <import feature="org.eclipse.launchbar.remote" version="1.0.0"/>
    </requires>
 
diff --git a/toolchains/arduino/pom.xml b/toolchains/arduino/pom.xml
index 470c8cebdbc..fa186bf733c 100644
--- a/toolchains/arduino/pom.xml
+++ b/toolchains/arduino/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/upc/org.eclipse.cdt.bupc-feature/feature.xml b/upc/org.eclipse.cdt.bupc-feature/feature.xml
index 12497b65322..c3911384513 100644
--- a/upc/org.eclipse.cdt.bupc-feature/feature.xml
+++ b/upc/org.eclipse.cdt.bupc-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.bupc"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.managedbuilder.bupc.ui"
       license-feature="org.eclipse.license"
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 08ecd4ef608..36608ebbcbd 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.core.parser.upc.feature"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.core.parser.upc"
       license-feature="org.eclipse.license"
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 b3c513a34dc..66ac739f176 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,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.core.parser.upc.sdk"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.core.parser.upc.source"
       license-feature="org.eclipse.license"
diff --git a/upc/pom.xml b/upc/pom.xml
index d88aeb54340..39e089ea20f 100644
--- a/upc/pom.xml
+++ b/upc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.upc-parent</artifactId>
diff --git a/util/pom.xml b/util/pom.xml
index 4821ac5143c..75b99add2c1 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.util-parent</artifactId>
diff --git a/visualizer/org.eclipse.cdt.visualizer-feature/feature.xml b/visualizer/org.eclipse.cdt.visualizer-feature/feature.xml
index e1b2c9a1fc1..265597b9e3e 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/visualizer/pom.xml b/visualizer/pom.xml
index 2934a55d804..6f271bed187 100644
--- a/visualizer/pom.xml
+++ b/visualizer/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.visualizer-parent</artifactId>
diff --git a/windows/org.eclipse.cdt.msw-feature/feature.xml b/windows/org.eclipse.cdt.msw-feature/feature.xml
index c1efd1d2732..3a44c41f08e 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="Eclipse CDT"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/windows/pom.xml b/windows/pom.xml
index a6177a662aa..1a93c6daa4c 100644
--- a/windows/pom.xml
+++ b/windows/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.windows-parent</artifactId>
diff --git a/xlc/org.eclipse.cdt.xlc.feature/feature.xml b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
index 29de8854492..94fe81664fe 100644
--- a/xlc/org.eclipse.cdt.xlc.feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.xlc.feature"
       label="%featureName"
-      version="9.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.cdt.managedbuilder.xlc.core"
       license-feature="org.eclipse.license"
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
index 6290ca12379..0ea981390c0 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.8.1.qualifier"
+      version="9.8.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/xlc/pom.xml b/xlc/pom.xml
index ff52ec3f0c8..e49321781ea 100644
--- a/xlc/pom.xml
+++ b/xlc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.cdt</groupId>
 		<artifactId>cdt-parent</artifactId>
-		<version>9.8.1-SNAPSHOT</version>
+		<version>9.8.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.cdt.xlc-parent</artifactId>