diff --git a/content/help/faq.html b/content/help/faq.html
index 6a9ed9bdf3..b1ed499357 100644
--- a/content/help/faq.html
+++ b/content/help/faq.html
@@ -791,7 +791,7 @@ and
             Tomcat is reporting memory leaks caused by some class in Apache POI which uses ThreadLocal
         </h2>
 <div class="section">
-<p>Apache POI uses Java <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/ThreadLocal.html">ThreadLocals</a>
+<p>Apache POI uses Java <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/ThreadLocal.html">ThreadLocals</a>
                 in order to cache some data when Apache POI is used in a multi-threading environment (see also the FAQ about thread-safety above!)
             </p>
 <p>WebServers like Tomcat use thread-pooling to re-use threads to avoid the cost of frequent thread-startup and shutdown.
diff --git a/content/related-projects.html b/content/related-projects.html
index b60f14890c..ec05bc009b 100644
--- a/content/related-projects.html
+++ b/content/related-projects.html
@@ -227,6 +227,20 @@ document.write("Last Published: " + document.lastModified);
                     the alert email component.
 
                 </p>
+<a name="Apache+Linkis"></a>
+<h3 class="boxed">Apache Linkis</h3>
+<p>
+                
+<a href="https://linkis.apache.org/">Apache Linkis</a> is a computation middleware layer.
+                The linkis-storage component has an Excel read capability built using Apache Poi.
+              </p>
+<a name="Apache+Seatunnel"></a>
+<h3 class="boxed">Apache Seatunnel</h3>
+<p>
+                
+<a href="https://seatunnel.apache.org/">Apache Seatunnel</a> is a high-performance, distributed, massive data integration framework.
+                The seatunnel-connector-spark-email component uses Apache Poi.
+              </p>
 <a name="Worksheet+plugin+for+JSPWiki"></a>
 <h3 class="boxed">Worksheet plugin for JSPWiki</h3>
 <p>
@@ -239,26 +253,18 @@ document.write("Last Published: " + document.lastModified);
 <a name="Apache+incubating+projects"></a>
 <h2 class="boxed">Apache incubating projects</h2>
 <div class="section">
-<a name="Apache+Linkis"></a>
-<h3 class="boxed">Apache Linkis</h3>
+<a name="Apache+Fesod+%28incubating%29"></a>
+<h3 class="boxed">Apache Fesod (incubating)</h3>
 <p>
-                        
-<a href="https://linkis.apache.org/">Apache Linkis (incubating)</a> is a computation middleware layer.
-                        The linkis-storage component has an Excel read capability built using Apache Poi.
-                    </p>
-<a name="Apache+Seatunnel"></a>
-<h3 class="boxed">Apache Seatunnel</h3>
-<p>
-                        
-<a href="https://seatunnel.apache.org/">Apache Seatunnel (incubating)</a> is a high-performance, distributed, massive data integration framework.
-                        The seatunnel-connector-spark-email component uses Apache Poi.
-                    </p>
+                
+<a href="https://fesod.apache.org/">Apache Fesod</a> is a high-performance and memory-efficient Java library for reading and writing spreadsheet files, designed to simplify development and ensure reliability.
+              </p>
 <a name="Apache+ODF+Toolkit+%28retired%29"></a>
 <h3 class="boxed">Apache ODF Toolkit (retired)</h3>
 <p>
               
 <a href="https://incubator.apache.org/projects/odftoolkit.html">Apache ODF Toolkit (incubating)</a> is a set of Java modules that allow programmatic creation, scanning and manipulation of OpenDocument Format (ISO/IEC 26300 == ODF) documents.
-              See also <a href="https://odftoolkit.org/">new website</a>.
+              The project has continued with a <a href="https://odftoolkit.org/">new website</a>.
               </p>
 <a name="Apache+Corinthia+%28retired%29"></a>
 <h3 class="boxed">Apache Corinthia (retired)</h3>
diff --git a/content/versioning.html b/content/versioning.html
index fdbff8b4d5..ed29c5be57 100644
--- a/content/versioning.html
+++ b/content/versioning.html
@@ -220,6 +220,17 @@ document.write("Last Published: " + document.lastModified);
       </p>
 </div>
     
+<a name="Commercial+Support"></a>
+<h2 class="boxed">Commercial Support</h2>
+<div class="section">
+<p>
+        
+<a href="https://www.herodevs.com/support?utm_source=Referral&amp;utm_medium=link&amp;utm_campaign=PoiReferralLink&amp;utm_id=Poi">HeroDevs</a>
+        offers security and compatibility support for EOL versions of Apache POI. Find out more about their
+        <a href="https://www.herodevs.com/support?utm_source=Referral&amp;utm_medium=link&amp;utm_campaign=PoiReferralLink&amp;utm_id=Poi">Never Ending Support options</a>.
+      </p>
+</div>
+    
 <a name="Migrating+from+older+versions"></a>
 <h2 class="boxed">Migrating from older versions</h2>
 <div class="section">