diff --git a/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
index 7b9b212..3699371 100755
--- a/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.sse.ui; singleton:=true
-Bundle-Version: 1.7.100.qualifier
+Bundle-Version: 1.7.200.qualifier
 Bundle-Activator: org.eclipse.wst.sse.ui.internal.SSEUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -74,3 +74,4 @@
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.wst.sse.ui.internal.propertytester"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.wst.sse.ui
diff --git a/core/bundles/org.eclipse.wst.sse.ui/pom.xml b/core/bundles/org.eclipse.wst.sse.ui/pom.xml
index 1b0ccc0..4d49ba2 100644
--- a/core/bundles/org.eclipse.wst.sse.ui/pom.xml
+++ b/core/bundles/org.eclipse.wst.sse.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.sse.ui</artifactId>
-  <version>1.7.100-SNAPSHOT</version>
+  <version>1.7.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build> 
diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java
index db112f6..5d73ff4 100644
--- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java
+++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
+ * Copyright (c) 2001, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -14,17 +14,13 @@
  *******************************************************************************/
 package org.eclipse.wst.sse.ui.internal.extension;
 
-
-
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPluginRegistry;
 import org.eclipse.wst.sse.ui.internal.Logger;
 import org.eclipse.wst.sse.ui.internal.util.Sorter;
 
-
 /**
  * Template implementation of a registry reader that creates objects
  * representing registry contents. Typically, an extension contains one
@@ -148,19 +144,6 @@
 	protected void readExtension(IExtension extension) {
 		readElements(extension.getConfigurationElements());
 	}
-
-	/**
-	 * @deprecated use readRegistry(IExtensionRegistry registry, String pluginId, String extensionPoint)
-	 */
-	protected void readRegistry(IPluginRegistry registry, String pluginId, String extensionPoint) {
-		IExtensionPoint point = registry.getExtensionPoint(pluginId, extensionPoint);
-		if (point != null) {
-			IExtension[] extensions = point.getExtensions();
-			extensions = orderExtensions(extensions);
-			for (int i = 0; i < extensions.length; i++)
-				readExtension(extensions[i]);
-		}
-	}
 	
 	/**
 	 * Start the registry reading process using the supplied plugin ID and
diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java
index 99baf06..925fee0 100644
--- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java
+++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
+ * Copyright (c) 2001, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -14,16 +14,12 @@
  *******************************************************************************/
 package org.eclipse.wst.sse.ui.internal.util;
 
-
-
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPluginRegistry;
 import org.eclipse.wst.sse.ui.internal.Logger;
 
-
 /**
  * Template implementation of a registry reader that creates objects
  * representing registry contents. Typically, an extension contains one
@@ -147,19 +143,6 @@
 	protected void readExtension(IExtension extension) {
 		readElements(extension.getConfigurationElements());
 	}
-
-	/**
-	 * @deprecated use readRegistry(IExtensionRegistry registry, String pluginId, String extensionPoint)
-	 */
-	protected void readRegistry(IPluginRegistry registry, String pluginId, String extensionPoint) {
-		IExtensionPoint point = registry.getExtensionPoint(pluginId, extensionPoint);
-		if (point != null) {
-			IExtension[] extensions = point.getExtensions();
-			extensions = orderExtensions(extensions);
-			for (int i = 0; i < extensions.length; i++)
-				readExtension(extensions[i]);
-		}
-	}
 	
 	/**
 	 * Start the registry reading process using the supplied plugin ID and
diff --git a/web/features/org.eclipse.wst.web_core.feature/feature.xml b/web/features/org.eclipse.wst.web_core.feature/feature.xml
index 66869a8..d00e19b 100644
--- a/web/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_core.feature"
       label="%featureName"
-      version="3.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_core.feature/pom.xml b/web/features/org.eclipse.wst.web_core.feature/pom.xml
index a1d265f..53d72f9 100644
--- a/web/features/org.eclipse.wst.web_core.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_core.feature</artifactId>
-  <version>3.21.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/feature.xml b/web/features/org.eclipse.wst.web_js_support.feature/feature.xml
index 0f781e5..068180d 100644
--- a/web/features/org.eclipse.wst.web_js_support.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_js_support.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_js_support.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/pom.xml b/web/features/org.eclipse.wst.web_js_support.feature/pom.xml
index 4e5ef4b..dc9f75b 100644
--- a/web/features/org.eclipse.wst.web_js_support.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_js_support.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_js_support.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml b/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml
index 554ef0b..fd6cba1 100644
--- a/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_js_support_sdk.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml b/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml
index b0810a2..a200ee6 100644
--- a/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_js_support_sdk.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.xml b/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.xml
index 859b139..ff6718c 100644
--- a/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_js_support_tests.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_js_support_tests.feature"
       label="%featureName"
-      version="3.19.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_js_support_tests.feature/pom.xml b/web/features/org.eclipse.wst.web_js_support_tests.feature/pom.xml
index bd46a40..7b8c0eb 100644
--- a/web/features/org.eclipse.wst.web_js_support_tests.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_js_support_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_js_support_tests.feature</artifactId>
-  <version>3.19.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
index 4b6139f..6175608 100644
--- a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_sdk.feature"
       label="%featureName"
-      version="3.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_sdk.feature/pom.xml b/web/features/org.eclipse.wst.web_sdk.feature/pom.xml
index 02b802f..76c4484 100644
--- a/web/features/org.eclipse.wst.web_sdk.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_sdk.feature</artifactId>
-  <version>3.21.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/web/features/org.eclipse.wst.web_tests.feature/feature.xml b/web/features/org.eclipse.wst.web_tests.feature/feature.xml
index e194fa1..8997df9 100644
--- a/web/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_tests.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_tests.feature"
       label="%featureName"
-      version="3.19.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_tests.feature/pom.xml b/web/features/org.eclipse.wst.web_tests.feature/pom.xml
index 80a707a..664aa7f 100644
--- a/web/features/org.eclipse.wst.web_tests.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_tests.feature</artifactId>
-  <version>3.19.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/web/features/org.eclipse.wst.web_ui.feature/feature.xml b/web/features/org.eclipse.wst.web_ui.feature/feature.xml
index 9ee2762..721b8e5 100644
--- a/web/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_ui.feature"
       label="%featureName"
-      version="3.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wst.web.ui"
       license-feature="org.eclipse.license"
diff --git a/web/features/org.eclipse.wst.web_ui.feature/pom.xml b/web/features/org.eclipse.wst.web_ui.feature/pom.xml
index e0ea6c2..3a9dd41 100644
--- a/web/features/org.eclipse.wst.web_ui.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_ui.feature</artifactId>
-  <version>3.21.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
index 8ed3338..8d3d465 100644
--- a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.xml_core.feature"
       label="%featureName"
-      version="3.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/xml/features/org.eclipse.wst.xml_core.feature/pom.xml b/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
index 18bf105..71ea0be 100644
--- a/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml_core.feature</artifactId>
-  <version>3.21.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
index 83093b4..630148d 100644
--- a/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.xml_sdk.feature"
       label="%featureName"
-      version="3.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml b/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml
index d02d827..1c7a783 100644
--- a/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml_sdk.feature</artifactId>
-  <version>3.21.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml b/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml
index ece8354..b45fe23 100644
--- a/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.xml_tests.feature"
       label="%featureName"
-      version="3.19.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml b/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml
index 1bddef4..c62d3be 100644
--- a/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml_tests.feature</artifactId>
-  <version>3.19.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml b/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml
index 74b8191..3ee0da4 100644
--- a/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.xml_ui.feature"
       label="%featureName"
-      version="3.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wst.xml.ui"
       license-feature="org.eclipse.license"
diff --git a/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml b/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
index 4cbca75..0f1be90 100644
--- a/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml_ui.feature</artifactId>
-  <version>3.21.0-SNAPSHOT</version>
+  <version>3.22.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>