diff --git a/appserver/admin/template/src/main/resources/config/default-web.xml b/appserver/admin/template/src/main/resources/config/default-web.xml
index 17429637c66..54d14895c85 100644
--- a/appserver/admin/template/src/main/resources/config/default-web.xml
+++ b/appserver/admin/template/src/main/resources/config/default-web.xml
@@ -174,10 +174,6 @@
   <!--                       (separate from the JVM that the application    -->
   <!--                       server is running in). [true]                  -->
   <!--                                                                      -->
-  <!--   ieClassId           The class-id value to be sent to Internet      -->
-  <!--                       Explorer when using <jsp:plugin> tags.         -->
-  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
-  <!--                                                                      -->
   <!--   javaEncoding        Java file encoding to use for generating java  -->
   <!--                       source files. [UTF8]                           -->
   <!--                                                                      -->
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 74b245e0635..48e2f466b58 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -134,7 +134,7 @@
 
         <!-- Jakarta Pages -->
         <jakarta.pages-api.version>3.1.0</jakarta.pages-api.version>
-        <wasp.version>3.1.0-M2</wasp.version>
+        <wasp.version>3.1.0-M3</wasp.version>
 
         <!-- Used for Jakarta SOAP (XML Web Services) -->
         <xmlsec.version>2.3.0</xmlsec.version>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java
index bfee083d7d6..2b56d3ef0db 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java
@@ -22,10 +22,6 @@
  * Unit test for Bugtraq 5027440 ("Impossible for webapp to override global
  * JspServlet settings").
  *
- * Note that for test "jsp-servlet-override-ieClassId" to work, JSP
- * precompilation must be turned off (see build.properties in this directory),
- * so that the value of the 'ieClassId' property is gotten from the JspServlet
- * (instead of from the JspC command line).
  */
 public class WebTest {
 
@@ -50,7 +46,6 @@ public static void main(String[] args) {
         stat.addDescription("Unit test for Bugtraq 5027440");
         WebTest webTest = new WebTest(args);
         try {
-            webTest.overrideIeClassId();
             webTest.jspInclude();
             stat.addStatus(TEST_NAME, stat.PASS);
         } catch (Exception ex) {
@@ -62,52 +57,6 @@ public static void main(String[] args) {
         stat.printSummary();
     }
 
-    private void overrideIeClassId() throws Exception {
-        URL url = new URL("http://" + host  + ":" + port +
-            contextRoot + "/jsp/overrideIeClassId.jsp");
-        System.out.println("Connecting to: " + url.toString());
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-        conn.connect();
-        int responseCode = conn.getResponseCode();
-        if (responseCode != 200) {
-            throw new Exception("Wrong response code. Expected: 200" +
-                ", received: " + responseCode);
-        }
-
-        BufferedReader br = null;
-        try {
-            br = new BufferedReader(new InputStreamReader(
-                conn.getInputStream()));
-            String line = null;
-            while ((line = br.readLine()) != null) {
-                if (line.startsWith("<OBJECT")) {
-                    break;
-                }
-            }
-
-            if (line != null) {
-                // Check <OBJECT> classid comment
-                System.out.println(line);
-                String classid = getAttributeValue(line, "classid");
-                if (classid != null) {
-                    if (!classid.equals(OBJECT_CLASSID)) {
-                        throw new Exception("Wrong classid: " + classid +
-                            ", expected: " + OBJECT_CLASSID);
-                    }
-                } else {
-                    throw new Exception("Missing classid");
-                }
-
-            } else {
-                throw new Exception("Missing OBJECT element in response body");
-            }
-        } finally {
-            try {
-                if (br != null) br.close();
-            } catch (IOException ex) {}
-        }
-    }
-
     private void jspInclude() throws Exception {
         URL url = new URL("http://" + host  + ":" + port +
             contextRoot + "/jsp/include.jsp");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/descriptor/web.xml
index 350382e0e56..fd9ed232a78 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/descriptor/web.xml
@@ -25,10 +25,6 @@
   <servlet>
     <servlet-name>jsp</servlet-name>
     <servlet-class>org.glassfish.wasp.servlet.JspServlet</servlet-class>
-    <init-param>
-      <param-name>ieClassId</param-name>
-      <param-value>ABCD</param-value>
-    </init-param>
   </servlet>
 
 </web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/docroot/jsp/overrideIeClassId.jsp b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/docroot/jsp/overrideIeClassId.jsp
deleted file mode 100644
index f5eeb84895d..00000000000
--- a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/docroot/jsp/overrideIeClassId.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%--
-
-    Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%><jsp:plugin type="applet" codebase="./test" code="TestApplet.class"/>
-
diff --git a/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml b/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml
index fbd87c47706..d042d5b27b1 100644
--- a/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml
+++ b/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml
@@ -170,10 +170,6 @@
   <!--                       (separate from the JVM that the application    -->
   <!--                       server is running in). [true]                  -->
   <!--                                                                      -->
-  <!--   ieClassId           The class-id value to be sent to Internet      -->
-  <!--                       Explorer when using <jsp:plugin> tags.         -->
-  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
-  <!--                                                                      -->
   <!--   javaEncoding        Java file encoding to use for generating java  -->
   <!--                       source files. [UTF8]                           -->
   <!--                                                                      -->
diff --git a/appserver/tests/tck/tck-download/jakarta-pages-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-pages-tck/pom.xml
index ada0bdc65ba..dfcff96dc89 100644
--- a/appserver/tests/tck/tck-download/jakarta-pages-tck/pom.xml
+++ b/appserver/tests/tck/tck-download/jakarta-pages-tck/pom.xml
@@ -51,6 +51,8 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <skipCache>true</skipCache>
+                    <overwrite>true</overwrite>
                     <url>${tck.test.pages.url}</url>
                     <unpack>false</unpack>
                     <outputDirectory>${project.build.directory}</outputDirectory>
diff --git a/appserver/web/web-embed/api/src/main/resources/org/glassfish/web/embed/default-web.xml b/appserver/web/web-embed/api/src/main/resources/org/glassfish/web/embed/default-web.xml
index b25a26a0fe1..8254cf9f062 100644
--- a/appserver/web/web-embed/api/src/main/resources/org/glassfish/web/embed/default-web.xml
+++ b/appserver/web/web-embed/api/src/main/resources/org/glassfish/web/embed/default-web.xml
@@ -173,10 +173,6 @@
   <!--                       (separate from the JVM that the application    -->
   <!--                       server is running in). [true]                  -->
   <!--                                                                      -->
-  <!--   ieClassId           The class-id value to be sent to Internet      -->
-  <!--                       Explorer when using <jsp:plugin> tags.         -->
-  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
-  <!--                                                                      -->
   <!--   javaEncoding        Java file encoding to use for generating java  -->
   <!--                       source files. [UTF8]                           -->
   <!--                                                                      -->
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/jsp/JSPCompiler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/jsp/JSPCompiler.java
index 2c7bef9fc89..21283b62aba 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/jsp/JSPCompiler.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/jsp/JSPCompiler.java
@@ -272,8 +272,6 @@ private static void configureJspc(JspC jspc, String pName, String pValue) {
             jspc.setClassDebugInfo(Boolean.valueOf(pValue).booleanValue());
         } else if ("enablePooling".equals(pName)) {
             jspc.setPoolingEnabled(Boolean.valueOf(pValue).booleanValue());
-        } else if ("ieClassId".equals(pName)) {
-            jspc.setIeClassId(pValue);
         } else if ("trimSpaces".equals(pName)) {
             jspc.setTrimSpaces(Boolean.valueOf(pValue).booleanValue());
         } else if ("genStrAsCharArray".equals(pName)) {
diff --git a/docs/application-deployment-guide/src/main/asciidoc/dd-elements.adoc b/docs/application-deployment-guide/src/main/asciidoc/dd-elements.adoc
index 1c20e5f0fd9..7d66a7697ce 100644
--- a/docs/application-deployment-guide/src/main/asciidoc/dd-elements.adoc
+++ b/docs/application-deployment-guide/src/main/asciidoc/dd-elements.adoc
@@ -5855,10 +5855,6 @@ as `char` arrays, which improves performance in some cases.
 |`httpMethods` |`*` for all methods |Specifies a comma separated list of
 HTTP methods supported by the `JspServlet`.
 
-|`ieClassId` |`clsid:8AD9C840-``044E-11D1-B3E9-``00805F499D93`
-|Specifies the Java plug-in COM class ID for Internet Explorer. Used by
-the `<jsp:plugin>` tags.
-
 |`ignoreJspFragmentErrors` |`false` |If set to `true`, instructs the
 compiler to ignore any JSP precompilation errors pertaining to
 statically included JSP segments that, despite not being top level JSP