diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 1ef0da6258..fb60b887e0 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -207,13 +207,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.itextpdf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="bcprov"
          download-size="0"
@@ -508,4 +501,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.github.librepdf.openpdf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.github.librepdf.openpdf-fonts-extra"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 91dc9191b3..e09802cc1c 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -31,13 +31,14 @@
     <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
     <setAttribute key="selected_target_bundles">
         <setEntry value="bcprov@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
         <setEntry value="com.google.http-client.google-http-client@default:default"/>
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch
index 94666c04ca..f4991f84c2 100644
--- a/org.adempiere.base-feature/packinfolder.app.launch
+++ b/org.adempiere.base-feature/packinfolder.app.launch
@@ -33,13 +33,14 @@
         <setEntry value="bcpkix@default:default"/>
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
         <setEntry value="com.google.http-client.google-http-client@default:default"/>
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.mail.imap@default:default"/>
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index 140ac22c9e..e0604c4639 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -32,13 +32,14 @@
     <setAttribute key="selected_target_bundles">
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
         <setEntry value="com.google.http-client.google-http-client@default:default"/>
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.mail.imap@default:default"/>
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index 082e569c8e..5163b08b96 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -32,13 +32,14 @@
     <setAttribute key="selected_target_bundles">
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
         <setEntry value="com.google.http-client.google-http-client@default:default"/>
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.mail.imap@default:default"/>
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index a631833985..713d4a12f6 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -32,13 +32,14 @@
     <setAttribute key="selected_target_bundles">
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.relaxng.Datatype@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
         <setEntry value="com.google.http-client.google-http-client@default:default"/>
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.mail.imap@default:default"/>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 4cd9e3de75..42e9d5fd53 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -141,7 +141,6 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  org.passay;bundle-version="0.0.0",
  org.cryptacular,
- com.itextpdf;bundle-version="0.0.0",
  net.sf.supercsv.super-csv;bundle-version="0.0.0",
  bcprov;bundle-version="1.54.0",
  org.krysalis.barcode4j;bundle-version="0.0.0",
@@ -162,6 +161,8 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  org.apache.httpcomponents.httpcore;bundle-version="4.4.12",
  com.google.guava;bundle-version="28.2.0",
  wrapped.com.google.zxing.javase;bundle-version="3.4.1",
- wrapped.dev.samstevens.totp.totp;bundle-version="1.7.1"
+ wrapped.dev.samstevens.totp.totp;bundle-version="1.7.1",
+ com.github.librepdf.openpdf;bundle-version="1.3.26",
+ com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.26"
 Automatic-Module-Name: org.adempiere.base
 Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.base/src/org/adempiere/pdf/Document.java b/org.adempiere.base/src/org/adempiere/pdf/Document.java
index b3c458f3b3..2612bd7c25 100644
--- a/org.adempiere.base/src/org/adempiere/pdf/Document.java
+++ b/org.adempiere.base/src/org/adempiere/pdf/Document.java
@@ -24,13 +24,13 @@ import java.io.OutputStream;
 import org.adempiere.exceptions.AdempiereException;
 import org.compiere.model.MSysConfig;
 
-import com.itextpdf.text.FontFactory;
-import com.itextpdf.text.Rectangle;
-import com.itextpdf.awt.DefaultFontMapper;
-import com.itextpdf.awt.PdfGraphics2D;
-import com.itextpdf.text.pdf.PdfContentByte;
-import com.itextpdf.text.pdf.PdfTemplate;
-import com.itextpdf.text.pdf.PdfWriter;
+import com.lowagie.text.FontFactory;
+import com.lowagie.text.Rectangle;
+import com.lowagie.text.pdf.DefaultFontMapper;
+import com.lowagie.text.pdf.PdfContentByte;
+import com.lowagie.text.pdf.PdfGraphics2D;
+import com.lowagie.text.pdf.PdfTemplate;
+import com.lowagie.text.pdf.PdfWriter;
 
 /**
  * Generate PDF document using iText
@@ -48,8 +48,8 @@ public class Document {
 		try {
             final PageFormat pf = pageable.getPageFormat(0);
             
-            final com.itextpdf.text.Document document =
-            	new com.itextpdf.text.Document(new Rectangle(
+            final com.lowagie.text.Document document =
+            	new com.lowagie.text.Document(new Rectangle(
             			(int) pf.getWidth(), (int) pf.getHeight()));
             final PdfWriter writer = PdfWriter.getInstance(
                     document, output);
@@ -77,7 +77,7 @@ public class Document {
             	}
             	
 	            PdfTemplate tp = cb.createTemplate(w, h);
-	            Graphics2D g2 = new PdfGraphics2D(tp, w, h, mapper);
+	            Graphics2D g2 = new PdfGraphics2D(tp, w, h, mapper, false, false, 1f);
 	            tp.setWidth(w);
 	            tp.setHeight(h);
 	            pageable.getPrintable(page).print(g2, pf, page);
diff --git a/org.adempiere.base/src/org/compiere/util/Util.java b/org.adempiere.base/src/org/compiere/util/Util.java
index 722ec24306..9a6c2f4649 100644
--- a/org.adempiere.base/src/org/compiere/util/Util.java
+++ b/org.adempiere.base/src/org/compiere/util/Util.java
@@ -41,12 +41,12 @@ import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 
-import com.itextpdf.text.Document;
-import com.itextpdf.text.DocumentException;
-import com.itextpdf.text.pdf.PdfContentByte;
-import com.itextpdf.text.pdf.PdfImportedPage;
-import com.itextpdf.text.pdf.PdfReader;
-import com.itextpdf.text.pdf.PdfWriter;
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.pdf.PdfContentByte;
+import com.lowagie.text.pdf.PdfImportedPage;
+import com.lowagie.text.pdf.PdfReader;
+import com.lowagie.text.pdf.PdfWriter;
 
 /**
  *  General Utilities
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index d54a26ae63..05a4df1e1a 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -29,13 +29,14 @@
     <setAttribute key="selected_target_bundles">
         <setEntry value="bcpkix@default:default"/>
         <setEntry value="bcprov@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
         <setEntry value="com.google.http-client.google-http-client@default:default"/>
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.mail.gimap@default:default"/>
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index 4c6f61d8dd..f82c1a1bc7 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -29,13 +29,14 @@
     <setAttribute key="selected_target_bundles">
         <setEntry value="bcpkix@default:default"/>
         <setEntry value="bcprov@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
         <setEntry value="com.google.http-client.google-http-client@default:default"/>
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.mail.gimap@default:default"/>
diff --git a/org.adempiere.install/install.silent.app.launch b/org.adempiere.install/install.silent.app.launch
index 4b48c83d88..72b647be33 100644
--- a/org.adempiere.install/install.silent.app.launch
+++ b/org.adempiere.install/install.silent.app.launch
@@ -29,13 +29,14 @@
     <setAttribute key="selected_target_bundles">
         <setEntry value="bcpkix@default:default"/>
         <setEntry value="bcprov@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
         <setEntry value="com.google.http-client.google-http-client@default:default"/>
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.mail.gimap@default:default"/>
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index d3312c4a34..3438000618 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Import-Package: net.sourceforge.barbecue,
  org.osgi.service.event
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  net.sf.jasperreports.engine;bundle-version="6.3.1",
- com.itextpdf;bundle-version="5.5.13"
+ com.github.librepdf.openpdf;bundle-version="1.3.26",
+ com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.26"
 Service-Component: OSGI-INF/*.xml
 Export-Package: org.adempiere.report.jasper
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index c292c4aa5f..d1c7dd8f58 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -93,6 +93,8 @@
         <setEntry value="com.fasterxml.jackson.module.jackson-module-jsonSchema.source"/>
         <setEntry value="com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default"/>
         <setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.github.relaxng.Datatype@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
@@ -101,7 +103,6 @@
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index b91ab275be..c5b018cd2f 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -93,6 +93,8 @@
         <setEntry value="com.fasterxml.jackson.module.jackson-module-jsonSchema.source"/>
         <setEntry value="com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default"/>
         <setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.github.relaxng.Datatype@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
@@ -101,7 +103,6 @@
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 62e2aabb29..1892b87e28 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -53,7 +53,8 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
  org.eclipse.osgi.compatibility.state,\
  org.cryptacular,\
  net.sf.supercsv.super-csv,\
- com.itextpdf,\
+ com.github.librepdf.openpdf,\
+ com.github.librepdf.openpdf-fonts-extra,\
  com.jaspersoft.studio.bundles.barbecue,\
  org.jfree.chart,\
  org.jfree.jcommon,\
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 2f1b91957d..ba82f2bfe1 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -177,11 +177,12 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  zul;bundle-version="0.0.0",
  zweb;bundle-version="0.0.0",
  org.apache.commons.io;bundle-version="0.0.0",
- com.itextpdf;bundle-version="0.0.0",
  org.atmosphere.runtime;bundle-version="0.0.0",
  zkwebfragment,
  com.sun.activation.jakarta.activation;bundle-version="1.2.1",
- org.adempiere.base.process
+ org.adempiere.base.process,
+ com.github.librepdf.openpdf;bundle-version="1.3.26",
+ com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.26"
 Bundle-Activator: org.adempiere.webui.WebUIActivator
 Eclipse-ExtensibleAPI: true
 Web-ContextPath: webui
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
index e10f3d6089..9c3eb6b93c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
@@ -72,7 +72,7 @@ import org.zkoss.zk.ui.Desktop;
 import org.zkoss.zk.ui.Execution;
 import org.zkoss.zk.ui.Executions;
 
-import com.itextpdf.text.DocumentException;
+import com.lowagie.text.DocumentException;
 
 /**
  *  ZK Application Environment and utilities
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
index 29a539bb3d..3a932a92c6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
@@ -71,11 +71,11 @@ import org.zkoss.zul.Html;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.Vlayout;
 
-import com.itextpdf.text.Document;
-import com.itextpdf.text.pdf.PdfContentByte;
-import com.itextpdf.text.pdf.PdfImportedPage;
-import com.itextpdf.text.pdf.PdfReader;
-import com.itextpdf.text.pdf.PdfWriter;
+import com.lowagie.text.Document;
+import com.lowagie.text.pdf.PdfContentByte;
+import com.lowagie.text.pdf.PdfImportedPage;
+import com.lowagie.text.pdf.PdfReader;
+import com.lowagie.text.pdf.PdfWriter;
 
 /**
  *	Dialog to Start process or report.
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
index 84f7018ac9..af89036da2 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
@@ -74,7 +74,7 @@ import org.zkoss.zul.Center;
 import org.zkoss.zul.Filedownload;
 import org.zkoss.zul.South;
 
-import com.itextpdf.text.pdf.PdfReader;
+import com.lowagie.text.pdf.PdfReader;
 
 /**
  *  Payment Print & Export
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index 1f9facf9f9..97f6a01f28 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -1,186 +1,172 @@
 <!-- location entries for maven artifacts. append to the end of the generated 
 	org.idempiere.p2.targetplatform.target target platform file -->
 <locations>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.google.http-client</groupId>
-		<artifactId>google-http-client-gson</artifactId>
-		<version>1.38.1</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.http-client</groupId>
+	  <artifactId>google-http-client-gson</artifactId>
+	  <version>1.38.1</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.google.http-client</groupId>
-		<artifactId>google-http-client</artifactId>
-		<version>1.38.1</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.http-client</groupId>
+	  <artifactId>google-http-client</artifactId>
+	  <version>1.38.1</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.google.oauth-client</groupId>
-		<artifactId>google-oauth-client</artifactId>
-		<version>1.31.4</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.oauth-client</groupId>
+	  <artifactId>google-oauth-client</artifactId>
+	  <version>1.31.4</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>io.grpc</groupId>
-		<artifactId>grpc-context</artifactId>
-		<version>1.35.0</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>io.grpc</groupId>
+	  <artifactId>grpc-context</artifactId>
+	  <version>1.35.0</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>io.opencensus</groupId>
-		<artifactId>opencensus-contrib-http-util</artifactId>
-		<version>0.28.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>io.opencensus</groupId>
+	  <artifactId>opencensus-contrib-http-util</artifactId>
+	  <version>0.28.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>io.opencensus</groupId>
-		<artifactId>opencensus-api</artifactId>
-		<version>0.28.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>io.opencensus</groupId>
+	  <artifactId>opencensus-api</artifactId>
+	  <version>0.28.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.google.guava</groupId>
-		<artifactId>guava</artifactId>
-		<version>30.1.1-jre</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.guava</groupId>
+	  <artifactId>guava</artifactId>
+	  <version>30.1.1-jre</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.google.guava</groupId>
-		<artifactId>failureaccess</artifactId>
-		<version>1.0.1</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.guava</groupId>
+	  <artifactId>failureaccess</artifactId>
+	  <version>1.0.1</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.google.code.findbugs</groupId>
-		<artifactId>jsr305</artifactId>
-		<version>3.0.2</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.code.findbugs</groupId>
+	  <artifactId>jsr305</artifactId>
+	  <version>3.0.2</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.core</groupId>
-		<artifactId>jackson-annotations</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.core</groupId>
+	  <artifactId>jackson-annotations</artifactId>
+	  <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.core</groupId>
-		<artifactId>jackson-core</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.core</groupId>
+	  <artifactId>jackson-core</artifactId>
+	  <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.core</groupId>
-		<artifactId>jackson-databind</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.core</groupId>
+	  <artifactId>jackson-databind</artifactId>
+	  <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.dataformat</groupId>
-		<artifactId>jackson-dataformat-xml</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.datatype</groupId>
-		<artifactId>jackson-datatype-guava</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-guava</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.datatype</groupId>
-		<artifactId>jackson-datatype-joda</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-joda</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.datatype</groupId>
-		<artifactId>jackson-datatype-json-org</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-json-org</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.jaxrs</groupId>
-		<artifactId>jackson-jaxrs-base</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-base</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.jaxrs</groupId>
-		<artifactId>jackson-jaxrs-json-provider</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.jaxrs</groupId>
-		<artifactId>jackson-jaxrs-xml-provider</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-xml-provider</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.module</groupId>
-		<artifactId>jackson-module-jaxb-annotations</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.fasterxml.jackson.module</groupId>
-		<artifactId>jackson-module-jsonSchema</artifactId>
-		<version>2.12.3</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jsonSchema</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>org.json</groupId>
-		<artifactId>json</artifactId>
-		<version>20190722</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>org.json</groupId>
+	  <artifactId>json</artifactId>
+	  <version>20190722</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>javax.validation</groupId>
-		<artifactId>validation-api</artifactId>
-		<version>1.1.0.Final</version>
-		<type>jar</type>
+ 	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>javax.validation</groupId>
+	  <artifactId>validation-api</artifactId>
+	  <version>1.1.0.Final</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>dev.samstevens.totp</groupId>
-		<artifactId>totp</artifactId>
-		<version>1.7.1</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>dev.samstevens.totp</groupId>
+	  <artifactId>totp</artifactId>
+	  <version>1.7.1</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>com.google.zxing</groupId>
-		<artifactId>javase</artifactId>
-		<version>3.4.1</version>
-		<type>jar</type>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.zxing</groupId>
+	  <artifactId>javase</artifactId>
+	  <version>3.4.1</version>
+	  <type>jar</type>
 	</location>
-	<location includeSource="true" missingManifest="generate"
-		type="Maven">
-		<groupId>org.antlr</groupId>
-	    <artifactId>antlr4-runtime</artifactId>
-	    <version>4.9.2</version> 
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>org.antlr</groupId>
+	  <artifactId>antlr4-runtime</artifactId>
+	  <version>4.9.2</version>
+      <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.github.librepdf</groupId>
+      <artifactId>openpdf</artifactId>
+      <version>1.3.26</version>
+      <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.github.librepdf</groupId>
+      <artifactId>openpdf-fonts-extra</artifactId>
+      <version>1.3.26</version>
+      <type>jar</type>
 	</location>
-
 </locations>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index f74d2ed20b..795d12d4e4 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-210426" sequenceNumber="1619428882">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="idempiere-210816" sequenceNumber="1629090605">
   <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"/>
@@ -46,7 +47,6 @@
       <unit id="com.github.relaxng.Datatype" version="2011.1.0"/>
       <unit id="com.google.zxing.core" version="3.4.0"/>
       <unit id="com.ibm.icu" version="67.1.0"/>
-      <unit id="com.itextpdf" version="5.5.13.2"/>
       <unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
       <unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js8_b01"/>
       <unit id="com.sun.activation.jakarta.activation" version="1.2.2"/>
@@ -202,7 +202,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"/>
@@ -289,7 +289,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="javax.inject" version="1.0.0.v20091030"/>
       <unit id="javax.jms" version="1.1.0.v201205091237"/>
@@ -327,160 +327,173 @@
       <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>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.google.http-client</groupId>
-		  <artifactId>google-http-client-gson</artifactId>
-		  <version>1.38.1</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.google.http-client</groupId>
-		  <artifactId>google-http-client</artifactId>
-		  <version>1.38.1</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.google.oauth-client</groupId>
-		  <artifactId>google-oauth-client</artifactId>
-		  <version>1.31.4</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>io.grpc</groupId>
-		  <artifactId>grpc-context</artifactId>
-		  <version>1.35.0</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>io.opencensus</groupId>
-		  <artifactId>opencensus-contrib-http-util</artifactId>
-		  <version>0.28.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>io.opencensus</groupId>
-		  <artifactId>opencensus-api</artifactId>
-		  <version>0.28.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.google.guava</groupId>
-		  <artifactId>guava</artifactId>
-		  <version>30.1.1-jre</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.google.guava</groupId>
-		  <artifactId>failureaccess</artifactId>
-		  <version>1.0.1</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.google.code.findbugs</groupId>
-		  <artifactId>jsr305</artifactId>
-		  <version>3.0.2</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.core</groupId>
-		  <artifactId>jackson-annotations</artifactId>
-		  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.core</groupId>
-		  <artifactId>jackson-core</artifactId>
-		  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.core</groupId>
-		  <artifactId>jackson-databind</artifactId>
-		  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.dataformat</groupId>
-    	  <artifactId>jackson-dataformat-xml</artifactId>
-    	  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.datatype</groupId>
-    	  <artifactId>jackson-datatype-guava</artifactId>
-    	  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.datatype</groupId>
-    	  <artifactId>jackson-datatype-joda</artifactId>
-    	  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.datatype</groupId>
-    	  <artifactId>jackson-datatype-json-org</artifactId>
-    	  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.jaxrs</groupId>
-    	  <artifactId>jackson-jaxrs-base</artifactId>
-    	  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.jaxrs</groupId>
-    	  <artifactId>jackson-jaxrs-json-provider</artifactId>
-    	  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.jaxrs</groupId>
-    	  <artifactId>jackson-jaxrs-xml-provider</artifactId>
-    	  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.module</groupId>
-    	  <artifactId>jackson-module-jaxb-annotations</artifactId>
-    	  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.fasterxml.jackson.module</groupId>
-    	  <artifactId>jackson-module-jsonSchema</artifactId>
-    	  <version>2.12.3</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-	      <groupId>org.json</groupId>
-	      <artifactId>json</artifactId>
-	      <version>20190722</version>
-		  <type>jar</type>
-	  </location>
- 	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>javax.validation</groupId>
-	      <artifactId>validation-api</artifactId>
-	      <version>1.1.0.Final</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>dev.samstevens.totp</groupId>
-		  <artifactId>totp</artifactId>
-		  <version>1.7.1</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>com.google.zxing</groupId>
-		  <artifactId>javase</artifactId>
-		  <version>3.4.1</version>
-		  <type>jar</type>
-	  </location>
-	  <location includeSource="true" missingManifest="generate" type="Maven">
-		  <groupId>org.antlr</groupId>
-		  <artifactId>antlr4-runtime</artifactId>
-		  <version>4.9.2</version>
-	  </location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.http-client</groupId>
+	  <artifactId>google-http-client-gson</artifactId>
+	  <version>1.38.1</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.http-client</groupId>
+	  <artifactId>google-http-client</artifactId>
+	  <version>1.38.1</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.oauth-client</groupId>
+	  <artifactId>google-oauth-client</artifactId>
+	  <version>1.31.4</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>io.grpc</groupId>
+	  <artifactId>grpc-context</artifactId>
+	  <version>1.35.0</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>io.opencensus</groupId>
+	  <artifactId>opencensus-contrib-http-util</artifactId>
+	  <version>0.28.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>io.opencensus</groupId>
+	  <artifactId>opencensus-api</artifactId>
+	  <version>0.28.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.guava</groupId>
+	  <artifactId>guava</artifactId>
+	  <version>30.1.1-jre</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.guava</groupId>
+	  <artifactId>failureaccess</artifactId>
+	  <version>1.0.1</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.code.findbugs</groupId>
+	  <artifactId>jsr305</artifactId>
+	  <version>3.0.2</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.core</groupId>
+	  <artifactId>jackson-annotations</artifactId>
+	  <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.core</groupId>
+	  <artifactId>jackson-core</artifactId>
+	  <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.core</groupId>
+	  <artifactId>jackson-databind</artifactId>
+	  <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-guava</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-joda</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-json-org</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-base</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-xml-provider</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jsonSchema</artifactId>
+      <version>2.12.3</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>org.json</groupId>
+	  <artifactId>json</artifactId>
+	  <version>20190722</version>
+	  <type>jar</type>
+	</location>
+ 	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>javax.validation</groupId>
+	  <artifactId>validation-api</artifactId>
+	  <version>1.1.0.Final</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>dev.samstevens.totp</groupId>
+	  <artifactId>totp</artifactId>
+	  <version>1.7.1</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.google.zxing</groupId>
+	  <artifactId>javase</artifactId>
+	  <version>3.4.1</version>
+	  <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>org.antlr</groupId>
+	  <artifactId>antlr4-runtime</artifactId>
+	  <version>4.9.2</version>
+      <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.github.librepdf</groupId>
+      <artifactId>openpdf</artifactId>
+      <version>1.3.26</version>
+      <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>com.github.librepdf</groupId>
+      <artifactId>openpdf-fonts-extra</artifactId>
+      <version>1.3.26</version>
+      <type>jar</type>
+	</location>
   </locations>
 </target>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
index 617fd04acd..664b13daed 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
@@ -1,5 +1,5 @@
 
-target "idempiere-210426"
+target "idempiere-210816"
 
 with source configurePhase allEnvironments
 
@@ -47,7 +47,6 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201101" {
 	com.github.relaxng.Datatype
 	com.google.zxing.core
 	com.ibm.icu
-	com.itextpdf
 	com.jaspersoft.studio.bundles.barbecue
 	com.jaspersoft.studio.bundles.itext
 	com.sun.activation.jakarta.activation
diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch
index 5ba01e10f8..c2fd7ebb64 100644
--- a/org.idempiere.test/idempiere.unit.test.launch
+++ b/org.idempiere.test/idempiere.unit.test.launch
@@ -56,6 +56,8 @@
         <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>
         <setEntry value="com.fasterxml.jackson.module.jackson-module-jsonSchema@default:default"/>
         <setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
+        <setEntry value="com.github.librepdf.openpdf@default:default"/>
         <setEntry value="com.github.relaxng.Datatype@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
@@ -64,7 +66,6 @@
         <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
-        <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>