diff --git a/appserver/admin/gf_template/src/main/resources/config/domain.xml b/appserver/admin/gf_template/src/main/resources/config/domain.xml
index a8aa51aedfb..e934a3b8124 100644
--- a/appserver/admin/gf_template/src/main/resources/config/domain.xml
+++ b/appserver/admin/gf_template/src/main/resources/config/domain.xml
@@ -317,6 +317,7 @@
                 <thread-pool name="http-thread-pool" max-queue-size="4096"></thread-pool>
                 <thread-pool name="thread-pool-1" max-thread-pool-size="200" />
             </thread-pools>
+            <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
         </config>
         <config name="default-config" dynamic-reconfiguration-enabled="true">
             <payara-executor-service-configuration />
@@ -581,6 +582,7 @@
             <system-property name="OSGI_SHELL_TELNET_PORT" value="26666" />
             <system-property name="JAVA_DEBUGGER_PORT" value="29009" />
             <system-property name="HZ_LISTENER_PORT" value="5900" />
+            <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
         </config>
     </configs>
     <property name="administrative.domain.name" value="%%%DOMAIN_NAME%%%" />
diff --git a/appserver/admin/gf_template_web/src/main/resources/config/domain.xml b/appserver/admin/gf_template_web/src/main/resources/config/domain.xml
index 10b9180bee0..b0dc4c40482 100644
--- a/appserver/admin/gf_template_web/src/main/resources/config/domain.xml
+++ b/appserver/admin/gf_template_web/src/main/resources/config/domain.xml
@@ -312,6 +312,7 @@
         <thread-pool name="http-thread-pool" max-queue-size="4096"></thread-pool>
         <thread-pool name="thread-pool-1" max-thread-pool-size="200" />
       </thread-pools>
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
     <config name="default-config" dynamic-reconfiguration-enabled="true">
       <http-service>
@@ -571,6 +572,7 @@
       <system-property name="OSGI_SHELL_TELNET_PORT" value="26666" />
       <system-property name="JAVA_DEBUGGER_PORT" value="29009" />
       <system-property name="HZ_LISTENER_PORT" value="5900" />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
   </configs>
   <property name="administrative.domain.name" value="%%%DOMAIN_NAME%%%" />
diff --git a/appserver/admin/production_domain_template/src/main/resources/config/domain.xml b/appserver/admin/production_domain_template/src/main/resources/config/domain.xml
index dff784a8072..3a3ec469c27 100644
--- a/appserver/admin/production_domain_template/src/main/resources/config/domain.xml
+++ b/appserver/admin/production_domain_template/src/main/resources/config/domain.xml
@@ -269,6 +269,7 @@
       <system-property name="jersey.config.client.connectTimeout" value="300000" />
       <system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
       <system-property name="org.jboss.weld.probe.allowRemoteAddress" value="127.0.0.1|::1|::1%.+|0:0:0:0:0:0:0:1|0:0:0:0:0:0:0:1%.+" />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
 
     <config name="default-config" dynamic-reconfiguration-enabled="true">
@@ -507,6 +508,7 @@
       <system-property name="HZ_LISTENER_PORT" value="5900" />
       <system-property name="fish.payara.classloading.delegate" value="false" />
       <system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
   </configs>
 
diff --git a/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml b/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml
index 0b4fd85482b..17daed73809 100644
--- a/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml
+++ b/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml
@@ -292,6 +292,7 @@
       <system-property name="jersey.config.client.connectTimeout" value="300000" />
       <system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
       <system-property name="org.jboss.weld.probe.allowRemoteAddress" value="127.0.0.1|::1|::1%.+|0:0:0:0:0:0:0:1|0:0:0:0:0:0:0:1%.+" />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
     <config name="default-config" dynamic-reconfiguration-enabled="true">
       <http-service>
@@ -523,6 +524,7 @@
       <system-property name="HZ_LISTENER_PORT" value="5900" />
       <system-property name="fish.payara.classloading.delegate" value="false" />
       <system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
   </configs>
   <property name="administrative.domain.name" value="%%%DOMAIN_NAME%%%" />
diff --git a/appserver/orb/orb-iiop/pom.xml b/appserver/orb/orb-iiop/pom.xml
index 20c555dc7f6..6a6d43f671b 100755
--- a/appserver/orb/orb-iiop/pom.xml
+++ b/appserver/orb/orb-iiop/pom.xml
@@ -39,7 +39,7 @@
     holder.
     
 -->
-<!-- Portions Copyright [2017-2019] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright [2017-2021] [Payara Foundation and/or its affiliates] -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -99,10 +99,6 @@
             <groupId>org.glassfish.pfl</groupId>
             <artifactId>pfl-dynamic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.pfl</groupId>
-            <artifactId>pfl-asm</artifactId>
-        </dependency>
         <dependency>
             <groupId>fish.payara.server.internal.orb</groupId>
             <artifactId>orb-connector</artifactId>
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
index 45f86d538ba..abc06157ac2 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
@@ -37,11 +37,12 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-//Portions Copyright [2016-2019] [Payara Foundation and/or affiliates]
+//Portions Copyright [2016-2021] [Payara Foundation and/or affiliates]
 package org.glassfish.admin.rest.composite;
 
 import com.sun.enterprise.util.LocalStringManagerImpl;
 import com.sun.enterprise.admin.report.ActionReporter;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -84,6 +85,7 @@
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
+
 import org.glassfish.admin.rest.RestExtension;
 import org.glassfish.admin.rest.RestLogging;
 import org.glassfish.admin.rest.composite.metadata.AttributeReference;
@@ -106,7 +108,8 @@
 import org.glassfish.internal.api.Globals;
 import org.glassfish.jersey.media.sse.EventOutput;
 
-import static org.glassfish.pfl.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
+
 import org.jvnet.hk2.config.Attribute;
 import org.jvnet.hk2.config.MessageInterpolatorImpl;
 
diff --git a/nucleus/packager/nucleus-corba-base/pom.xml b/nucleus/packager/nucleus-corba-base/pom.xml
index caeaa6825a8..2d9f69bde52 100644
--- a/nucleus/packager/nucleus-corba-base/pom.xml
+++ b/nucleus/packager/nucleus-corba-base/pom.xml
@@ -40,6 +40,7 @@
     holder.
 
 -->
+<!-- Portions Copyright 2021 Payara Foundation and/or its affiliates -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -62,11 +63,6 @@
             <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-internal-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.pfl</groupId>
-            <artifactId>pfl-asm</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.pfl</groupId>
             <artifactId>pfl-basic</artifactId>
diff --git a/nucleus/pom.xml b/nucleus/pom.xml
index 7a119109332..c274fc0d687 100644
--- a/nucleus/pom.xml
+++ b/nucleus/pom.xml
@@ -150,9 +150,9 @@
         <trilead-ssh2.version>build-217-jenkins-16</trilead-ssh2.version>
 
         <!-- Primitive Function Library (PFL); a library of simple utilities used by Glassfish -->
-        <pfl.version>4.0.2.payara-p1</pfl.version>
+        <pfl.version>4.1.2</pfl.version>
         <!-- GlassFish MBean Annotation Library -->
-        <gmbal.version>4.0.0</gmbal.version>
+        <gmbal.version>4.0.3</gmbal.version>
         <antlr.version>2.7.7</antlr.version>
 
         <commons-io.version>2.11.0</commons-io.version>
@@ -864,11 +864,6 @@ Parent is ${project.parent}</echo>
                 <artifactId>pfl-basic-tools</artifactId>
                 <version>${pfl.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.glassfish.pfl</groupId>
-                <artifactId>pfl-asm</artifactId>
-                <version>${pfl.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.glassfish.pfl</groupId>
                 <artifactId>pfl-tf</artifactId>