diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index 7240626a8c..8794f02a1d 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -456,4 +456,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.commons.math3"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 4145d00699..c66e6b27b0 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -50,7 +50,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-modules=java.se&#10;--add-opens=java.base/java.lang=ALL-UNNAMED&#10;--add-opens=java.base/java.nio=ALL-UNNAMED&#10;--add-opens=java.base/sun.nio.ch=ALL-UNNAMED&#10;--add-opens=java.management/sun.management=ALL-UNNAMED&#10;--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED&#10;--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED&#10;--add-exports=java.desktop/sun.awt=ALL-UNNAMED&#10;--add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED&#10;--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED&#10;-Declipse.product=org.adempiere.server.product&#10;-Dosgi.noShutdown=true&#10;-Dosgi.framework.activeThreadType=normal&#10;-Dorg.osgi.framework.bootdelegation=sun.security.ssl&#10;-Dosgi.compatibility.bootdelegation=true&#10;-Djetty.home=jettyhome&#10;-Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml&#10;-Dmail.mime.encodefilename=true&#10;-Dmail.mime.decodefilename=true&#10;-Dmail.mime.encodeparameters=true&#10;-Dmail.mime.decodeparameters=true&#10;-Dhazelcast.config=hazelcast.xml&#10;-Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
     <stringAttribute key="pde.version" value="3.3"/>
     <stringAttribute key="product" value="org.adempiere.server.server_product"/>
@@ -109,7 +109,7 @@
         <setEntry value="com.sun.org.apache.xml.internal.resolver@default:default"/>
         <setEntry value="com.sun.xml.bind.jaxb-impl@default:default"/>
         <setEntry value="com.sun.xml.fastinfoset.FastInfoset@default:default"/>
-        <setEntry value="com.sun.xml.messaging.saaj.impl*1.5.2.b01@default:default"/>
+        <setEntry value="com.sun.xml.messaging.saaj.impl@default:default"/>
         <setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/>
         <setEntry value="com.sun.xml.ws.jaxws-rt@default:default"/>
         <setEntry value="com.sun.xml.ws.policy@default:default"/>
@@ -161,6 +161,7 @@
         <setEntry value="org.apache.commons.lang3@default:default"/>
         <setEntry value="org.apache.commons.lang@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
+        <setEntry value="org.apache.commons.math3@default:default"/>
         <setEntry value="org.apache.commons.net@default:default"/>
         <setEntry value="org.apache.cxf.cxf-core@default:default"/>
         <setEntry value="org.apache.cxf.cxf-rt-bindings-soap@default:default"/>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 696a67bc68..73b696df6e 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="idempiere-201101" sequenceNumber="1604210681">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="idempiere-201101" sequenceNumber="1606184870">
   <locations>
-    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.sun.istack.commons-runtime" version="3.0.8"/>
       <unit id="com.sun.org.apache.xml.internal.resolver" version="20050927.0.0"/>
       <unit id="com.sun.xml.fastinfoset.FastInfoset" version="1.2.16"/>
@@ -22,7 +23,7 @@
       <unit id="org.jvnet.staxex.stax-ex" version="1.8.1"/>
       <repository location="https://idempiere.github.io/binary.file/p2.maven/org.idempiere.webservice.client-p2-R20190412"/>
     </location>
-    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="zcommon" version="9.5.0.1"/>
       <unit id="zel" version="9.5.0.1"/>
       <unit id="zhtml" version="9.5.0.1"/>
@@ -36,7 +37,7 @@
       <unit id="zweb-dsp" version="9.5.0.1"/>
       <repository location="https://idempiere.github.io/binary.file/p2.zk/9.5.0.1"/>
     </location>
-    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="bcmail" version="1.66.0"/>
       <unit id="bcpkix" version="1.66.0"/>
       <unit id="bcprov" version="1.66.0"/>
@@ -216,7 +217,7 @@
       <unit id="stax2-api" version="4.2.0"/>
       <repository location="https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201101"/>
     </location>
-    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="3.16.0.v20200828-0759"/>
       <unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
@@ -303,7 +304,7 @@
       <unit id="org.eclipse.jdt.junit5.runtime" version="1.0.1000.v20200720-0748"/>
       <repository location="https://download.eclipse.org/eclipse/updates/4.17"/>
     </location>
-    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
       <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
       <unit id="javax.inject" version="1.0.0.v20091030"/>
@@ -339,7 +340,8 @@
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
       <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
+      <unit id="org.apache.commons.math3" version="3.6.1.v20200817-1830"/>
       <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
     </location>
   </locations>
-</target>
\ No newline at end of file
+</target>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
index 964c6b4d55..bb6351e203 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
@@ -349,4 +349,5 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202008312006
 	org.hamcrest.core
 	org.w3c.css.sac
 	org.w3c.dom.svg
+	org.apache.commons.math3 [3.6.1,3.7.0)
 }	
\ No newline at end of file