diff --git a/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF
index 5b197dd..9ad546a 100755
--- a/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-SymbolicName: org.eclipse.wst.jsdt.ui; singleton:=true
-Bundle-Version: 2.1.200.qualifier
+Bundle-Version: 2.1.300.qualifier
 Bundle-Activator: org.eclipse.wst.jsdt.internal.ui.JavaScriptPlugin
 Import-Package: com.ibm.icu.text,
  com.ibm.icu.util,
@@ -56,7 +56,7 @@
  org.eclipse.wst.jsdt.internal.ui.fix;x-internal:=true,
  org.eclipse.wst.jsdt.internal.ui.infoviews;x-internal:=true,
  org.eclipse.wst.jsdt.internal.ui.javadocexport;x-internal:=true,
- org.eclipse.wst.jsdt.internal.ui.javaeditor;x-friends:="org.eclipse.wst.jsdt.junit,org.eclipse.wst.jsdt.debug.ui",
+ org.eclipse.wst.jsdt.internal.ui.javaeditor;x-friends:="org.eclipse.wst.jsdt.junit,org.eclipse.wst.jsdt.debug.ui,org.eclipse.wst.jsdt.ui.tests",
  org.eclipse.wst.jsdt.internal.ui.javaeditor.saveparticipant;x-internal:=true,
  org.eclipse.wst.jsdt.internal.ui.javaeditor.selectionactions;x-internal:=true,
  org.eclipse.wst.jsdt.internal.ui.model;x-internal:=true,
diff --git a/bundles/org.eclipse.wst.jsdt.ui/plugin.properties b/bundles/org.eclipse.wst.jsdt.ui/plugin.properties
index ea4d430..58ae549 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.jsdt.ui/plugin.properties
@@ -64,7 +64,7 @@
 newWizardCategoryName=JavaScript
 commonNavigatorContentName=JavaScript Elements
 
-javaScriptPropertiesPageName=JavaScript
+javaScriptPropertiesPageName=Client-side JavaScript
 buildPathPageName=Include Path
 codeStylePageName=Code Style
 codeTemplatePageName=Code Templates
diff --git a/bundles/org.eclipse.wst.jsdt.ui/pom.xml b/bundles/org.eclipse.wst.jsdt.ui/pom.xml
index 002ca68..5ef9708 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/pom.xml
+++ b/bundles/org.eclipse.wst.jsdt.ui/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.jsdt.bundles</groupId>
   <artifactId>org.eclipse.wst.jsdt.ui</artifactId>
-  <version>2.1.200-SNAPSHOT</version>
+  <version>2.1.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/features/org.eclipse.wst.jsdt.feature/feature.xml b/features/org.eclipse.wst.jsdt.feature/feature.xml
index 5194b6a..e09cd4f 100644
--- a/features/org.eclipse.wst.jsdt.feature/feature.xml
+++ b/features/org.eclipse.wst.jsdt.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.jsdt.feature"
       label="%featureName"
-      version="2.3.400.qualifier"
+      version="2.3.500.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wst.jsdt.ui"
       license-feature="org.eclipse.license"
@@ -108,14 +108,14 @@
          id="org.mozilla.javascript"
          download-size="0"
          install-size="0"
-         version="1.7.5.qualifier"
+         version="1.7.10.qualifier"
          unpack="false"/>
 
    <plugin
          id="com.google.javascript"
          download-size="0"
          install-size="0"
-         version="0.0.20160315.qualifier"
+         version="0.0.20210302.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/features/org.eclipse.wst.jsdt.feature/pom.xml b/features/org.eclipse.wst.jsdt.feature/pom.xml
index 80772bd..9477c56 100644
--- a/features/org.eclipse.wst.jsdt.feature/pom.xml
+++ b/features/org.eclipse.wst.jsdt.feature/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.jsdt.features</groupId>
   <artifactId>org.eclipse.wst.jsdt.feature</artifactId>
-  <version>2.3.400-SNAPSHOT</version>
+  <version>2.3.500-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>