diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
index 83adf61..1af43d2 100644
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
+++ b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
@@ -10,16 +10,15 @@
 
     Contributors:
         IBM Corporation - initial API and implementation
- -->
-
+ -->
 <feature
       id="org.eclipse.jst.webpageeditor.feature"
       label="%featureName"
-      version="2.9.0.qualifier"
+      version="2.9.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
-      license-feature-version="1.0.1.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/pom.xml b/jsf/features/org.eclipse.jst.webpageeditor.feature/pom.xml
index edd29e9..3435941 100644
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/pom.xml
+++ b/jsf/features/org.eclipse.jst.webpageeditor.feature/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.webpageeditor.feature</artifactId>
-  <version>2.9.0-SNAPSHOT</version>
+  <version>2.9.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
index 6c59236..9567223 100644
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
+++ b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
@@ -15,10 +15,10 @@
 <feature
       id="org.eclipse.jst.webpageeditor_sdk.feature"
       label="%featureName"
-      version="2.9.0.qualifier"
+      version="2.9.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="1.0.1.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/pom.xml b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/pom.xml
index ea4b8f7..d2e902a 100644
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/pom.xml
+++ b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.webpageeditor_sdk.feature</artifactId>
-  <version>2.9.0-SNAPSHOT</version>
+  <version>2.9.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
index 5a6e705..b225deb 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.jst.jsf.ui; singleton:=true
-Bundle-Version: 1.6.102.qualifier
+Bundle-Version: 1.6.103.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.ui.internal.JSFUiPlugin
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
@@ -19,7 +19,7 @@
  org.eclipse.wst.xml.ui;bundle-version="[1.0.100,2.0.0)",
  org.eclipse.wst.sse.ui;bundle-version="[1.0.101,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.jsp.ui;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.jst.jsp.ui;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.0.101,2.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/pom.xml b/jsf/plugins/org.eclipse.jst.jsf.ui/pom.xml
index 6f7e03e..318a624 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/pom.xml
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.ui</artifactId>
-  <version>1.6.102-SNAPSHOT</version>
+  <version>1.6.103-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
index f646478..790f883 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-SymbolicName: org.eclipse.jst.pagedesigner;singleton:=true
 Bundle-Name: %pluginName
-Bundle-Version: 1.8.2.qualifier
+Bundle-Version: 1.8.3.qualifier
 Bundle-Activator: org.eclipse.jst.pagedesigner.PDPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.17.0,4.0.0)",
  org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
@@ -13,23 +13,23 @@
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.0.101,2.0.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.jsp.ui;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.jst.jsp.core;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.jst.jsp.ui;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.pagedesigner.jsp.core;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.jst.jsf.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jst.jsf.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.html.ui;bundle-version="[1.0.100,2.0.0)",
- org.eclipse.wst.css.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.100,2.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.21.0,4.0.0)",
+ org.eclipse.jst.jsf.common;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.jst.jsf.core;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.21.0,4.0.0)",
+ org.eclipse.wst.html.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.wst.html.core;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.wst.xml.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.ui.views.properties.tabbed;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0]",
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/pom.xml b/jsf/plugins/org.eclipse.jst.pagedesigner/pom.xml
index a718e20..e0cf294 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/pom.xml
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2018 Eclipse Foundation and others.
+  Copyright (c) 2012, 2020 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.pagedesigner</artifactId>
-  <version>1.8.2-SNAPSHOT</version>
+  <version>1.8.3-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceDropTargetListener.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceDropTargetListener.java
index 322a300..a9aa7ac 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceDropTargetListener.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceDropTargetListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2011 Sybase, Inc. and others.
+ * Copyright (c) 2006, 2020 Sybase, Inc. and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -164,7 +164,7 @@
 				IResource[] resources = (IResource[]) data;
 				if (resources.length > 0 && (resources[0] instanceof IFile)) {
 					IFile file = (IFile) resources[0];
-					ITagDropSourceData dropSource = (ITagDropSourceData) file
+					ITagDropSourceData dropSource = file
 							.getAdapter(ITagDropSourceData.class);
 					if (dropSource != null) {
 						command = new PaletteDropInsertCommand(
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java
index d678e1a..ff1f156 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Sybase, Inc. and others.
+ * Copyright (c) 2006, 2020 Sybase, Inc. and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -18,6 +18,7 @@
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jst.pagedesigner.dnd.internal.DesignerSourceDropTargetListener;
 import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
 import org.eclipse.swt.dnd.DND;
@@ -41,6 +42,15 @@
     private IModelStateListener _modelStateListener;
 
     @Override
+    protected void installTextDragAndDrop(ISourceViewer textViewer) {
+        // intentional no-op
+    }
+    @Override
+    protected void uninstallTextDragAndDrop(ISourceViewer viewer) {
+        // do nothing
+    }
+
+    @Override
     protected void initializeDrop(final ITextViewer viewer)
     {
         int operations = DND.DROP_COPY | DND.DROP_MOVE;