diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/ErrorBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/ErrorBuildConfiguration.java
index fa83980f92e..585030ac91a 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/ErrorBuildConfiguration.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/ErrorBuildConfiguration.java
@@ -33,6 +33,8 @@ import org.eclipse.core.runtime.PlatformObject;
  *
  * TODO leaving most of the implementation as default. I don't think any of these methods get called when
  * we're in this error state but we'll keep an eye open for NPE's and bad behavior.
+ *
+ * @since 6.9
  */
 public class ErrorBuildConfiguration extends PlatformObject implements ICBuildConfiguration, ICBuildConfiguration2 {
 
diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
index 3f3072594b3..dcc27bc7970 100644
--- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
-Bundle-Version: 8.3.300.qualifier
+Bundle-Version: 8.4.0.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java
index 43906d4790b..eeefff9e0d7 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java
@@ -68,6 +68,9 @@ public class CoreBuildLaunchBarTracker implements ILaunchBarListener, ILaunchTar
 		targetManager.addListener(this);
 	}
 
+	/**
+	 * @since 8.4
+	 */
 	public void dispose() {
 		targetManager.removeListener(this);
 	}
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java
index eef1fd7984e..248c15c7fce 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java
@@ -117,6 +117,7 @@ public class LaunchUtils {
 	 * @param configuration Launch configuration to obtain paths from
 	 * @return the program path
 	 * @throws CoreException if program path can not be resolved.
+	 * @since 9.3
 	 */
 	public static String getProgramPath(ILaunchConfiguration configuration) throws CoreException {
 		return resolveProgramPath(configuration, null);
@@ -129,6 +130,7 @@ public class LaunchUtils {
 	 * @param programName Optional (can be null) starting point for program name
 	 * @return the program path
 	 * @throws CoreException if program path can not be resolved.
+	 * @since 9.3
 	 */
 	public static String resolveProgramPath(ILaunchConfiguration configuration, String programName)
 			throws CoreException {
@@ -170,6 +172,7 @@ public class LaunchUtils {
 	 * @param configuration Launch configuration to obtain project from
 	 * @return the project
 	 * @throws CoreException
+	 * @since 9.3
 	 */
 	public static IProject getProject(ILaunchConfiguration configuration) throws CoreException {
 		String projectName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME,
@@ -256,7 +259,6 @@ public class LaunchUtils {
 	/**
 	 * @since 6.1
 	 */
-	@SuppressWarnings("unchecked")
 	public static void enableActivity(final String activityID, final boolean enableit) {
 		if (PlatformUI.isWorkbenchRunning()) {
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
@@ -264,7 +266,7 @@ public class LaunchUtils {
 				public void run() {
 					IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
 					IActivityManager activityManager = workbenchActivitySupport.getActivityManager();
-					Set<String> enabledActivityIds = new HashSet<String>(activityManager.getEnabledActivityIds());
+					Set<String> enabledActivityIds = new HashSet<>(activityManager.getEnabledActivityIds());
 					boolean changed = false;
 					if (enableit)
 						changed = enabledActivityIds.add(activityID);
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/Messages.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/Messages.java
index 7d0b3f256b8..7002a1a5479 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/Messages.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/Messages.java
@@ -12,6 +12,9 @@ package org.eclipse.cdt.launch;
 
 import org.eclipse.osgi.util.NLS;
 
+/**
+ * @since 9.3
+ */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.cdt.launch.messages"; //$NON-NLS-1$
 	public static String LaunchUtils__0_not_found;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractArgumentsTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractArgumentsTab.java
index 4fa02b821cf..55c2f479c81 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractArgumentsTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractArgumentsTab.java
@@ -43,6 +43,7 @@ import org.eclipse.swt.widgets.Text;
 /**
  * A launch configuration tab that displays and edits program arguments,
  * and working directory launch configuration attributes.
+ * @since 9.3
  */
 public abstract class CAbstractArgumentsTab extends CLaunchConfigurationTab {
 	// Program arguments UI widgets