Merge branch 'main' into bug-fix-182

Author: sid-srini

build.xml

@@ -44,7 +44,8 @@
             patches/7548_source-1.8.diff
             patches/7583_source-1.8.diff
             patches/7610.diff
-            patches/7621.diff 
+            patches/7621.diff
+            patches/7641.diff
             patches/7654.diff
             patches/mvn-sh.diff
             patches/generate-dependencies.diff