diff --git a/.gitignore b/.gitignore
index 6d910a1bce..33f03c2bd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ ghidra.repos.config
 # Misc files produced while executing application
 repositories/
 dependencies/
+flatRepo/
 Ghidra/.ghidraSvrKeys
 wrapper.log*
 
diff --git a/GPL/GnuDisassembler/certification.manifest b/GPL/GnuDisassembler/certification.manifest
index 5ef30394a2..1692c70354 100644
--- a/GPL/GnuDisassembler/certification.manifest
+++ b/GPL/GnuDisassembler/certification.manifest
@@ -1,7 +1,6 @@
 ##VERSION: 2.0
 ##MODULE IP: GPL 2
 ##MODULE IP: Public Domain
-.project||GHIDRA||||END|
 Module.manifest||Public Domain||||END|
 README.txt||Public Domain||||END|
 data/arm_test1.s||Public Domain||||END|
diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html b/Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html
index 98bad04149..21f8caaf81 100644
--- a/Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html
+++ b/Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html
@@ -6,6 +6,19 @@
   </HEAD>
 
 <BODY>
+<H1 align="center">Ghidra 9.2.4 Change History (April 2021)</H1>
+<blockquote><p><u>Improvements</u></p>
+<ul>
+    <li><I>Basic Infrastructure</I>. Improved support running under JDK 16.  Note that Ghidra still only officially supports JDK 11 LTS. (GP-824, Issue #2879, #2888)</li>
+</ul>
+</blockquote>
+<blockquote><p><u>Bugs</u></p>
+<ul>
+    <li><I>API</I>. Corrected error condition which could occur if overlay memory block duplicates another memory space name or overlay block name in a case-insensitive manner.  The names are intended to be case-sensitive. (GP-839, Issue #2898)</li>
+    <li><I>Demangler</I>. Improved handling of mangled names on thunk functions which were previously left unmangled and could prevent name of underlying thunked function from appearing. (GP-809)</li>
+</ul>
+</blockquote>
+
 <H1 align="center">Ghidra 9.2.3 Change History (March 2021)</H1>
 <blockquote><p><u>Improvements</u></p>
 <ul>
@@ -23,7 +36,7 @@
 <blockquote><p><u>Bugs</u></p>
 <ul>
     <li><I>Analysis</I>. The RTTI analyzer now runs prior to Reference analysis so that references into vftables are not turned into code or data before the vftables are created. (GP-517)</li>
-    <li><I>API</I>. <code>Funtion.getCalledFunctions(TaskMonitor)</code> and <code>Function.getCallingFunctions(TaskMonitor)</code> now support passing <code>null</code> for the task monitor parameter, which previously would have thrown an exception. (GP-589, Issue #2643)</li>
+    <li><I>API</I>. <code>Function.getCalledFunctions(TaskMonitor)</code> and <code>Function.getCallingFunctions(TaskMonitor)</code> now support passing <code>null</code> for the task monitor parameter, which previously would have thrown an exception. (GP-589, Issue #2643)</li>
     <li><I>Data Types</I>. Corrected segmented 32-bit pointer datatype address generation for 16:16 x86 far pointers. (GP-534, Issue #2548)</li>
     <li><I>Decompiler</I>. Fixed Decompiler issue where, when a function name extends beyond the line limit, an end-of-line comment could wrap around to additional lines without including additional <code>//</code> comment indicators. (GP-473)</li>
     <li><I>Decompiler</I>. Corrected an exception that could occur when attempting to edit function signature from the Decompiler. (GP-597, Issue #2601)</li>
diff --git a/Ghidra/Debug/AnnotationValidator/certification.manifest b/Ghidra/Debug/AnnotationValidator/certification.manifest
index cc712d86bc..25b31ce77d 100644
--- a/Ghidra/Debug/AnnotationValidator/certification.manifest
+++ b/Ghidra/Debug/AnnotationValidator/certification.manifest
@@ -1,5 +1,3 @@
 ##VERSION: 2.0
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
 src/main/resources/META-INF/services/javax.annotation.processing.Processor||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/certification.manifest b/Ghidra/Debug/Debugger-agent-dbgeng/certification.manifest
index c6647b5a48..e9bc58dcf9 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/certification.manifest
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/certification.manifest
@@ -1,7 +1,5 @@
 ##VERSION: 2.0
 ##MODULE IP: Apache License 2.0
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
 src/javaprovider/def/javaprovider.def||GHIDRA||||END|
 src/javaprovider/rc/javaprovider.rc||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel-traceloader/certification.manifest b/Ghidra/Debug/Debugger-agent-dbgmodel-traceloader/certification.manifest
index 43c2fb2ca2..d1f21abd88 100644
--- a/Ghidra/Debug/Debugger-agent-dbgmodel-traceloader/certification.manifest
+++ b/Ghidra/Debug/Debugger-agent-dbgmodel-traceloader/certification.manifest
@@ -1,5 +1,3 @@
 ##VERSION: 2.0
 ##MODULE IP: Apache License 2.0
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/certification.manifest b/Ghidra/Debug/Debugger-agent-dbgmodel/certification.manifest
index 9fcd81392a..346cd88a39 100644
--- a/Ghidra/Debug/Debugger-agent-dbgmodel/certification.manifest
+++ b/Ghidra/Debug/Debugger-agent-dbgmodel/certification.manifest
@@ -1,7 +1,5 @@
 ##VERSION: 2.0
 ##MODULE IP: Apache License 2.0
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
 src/javaprovider/def/javaprovider.def||GHIDRA||||END|
 src/javaprovider/rc/javaprovider.rc||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger-gadp/certification.manifest b/Ghidra/Debug/Debugger-gadp/certification.manifest
index c68e441edf..c13ec51883 100644
--- a/Ghidra/Debug/Debugger-gadp/certification.manifest
+++ b/Ghidra/Debug/Debugger-gadp/certification.manifest
@@ -1,5 +1,3 @@
 ##VERSION: 2.0
 ##MODULE IP: BSD
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger-jpda/certification.manifest b/Ghidra/Debug/Debugger-jpda/certification.manifest
index 5c54cc06d6..895ac4b698 100644
--- a/Ghidra/Debug/Debugger-jpda/certification.manifest
+++ b/Ghidra/Debug/Debugger-jpda/certification.manifest
@@ -1,4 +1,2 @@
 ##VERSION: 2.0
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger/certification.manifest b/Ghidra/Debug/Debugger/certification.manifest
index 2726610536..85d81fb223 100644
--- a/Ghidra/Debug/Debugger/certification.manifest
+++ b/Ghidra/Debug/Debugger/certification.manifest
@@ -4,8 +4,6 @@
 ##MODULE IP: Nuvola Icons - LGPL 2.1
 ##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: Tango Icons - Public Domain
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|
 src/main/help/help/TOC_Source.xml||GHIDRA||||END|
diff --git a/Ghidra/Debug/Framework-AsyncComm/certification.manifest b/Ghidra/Debug/Framework-AsyncComm/certification.manifest
index 5c54cc06d6..895ac4b698 100644
--- a/Ghidra/Debug/Framework-AsyncComm/certification.manifest
+++ b/Ghidra/Debug/Framework-AsyncComm/certification.manifest
@@ -1,4 +1,2 @@
 ##VERSION: 2.0
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
diff --git a/Ghidra/Debug/Framework-Debugging/certification.manifest b/Ghidra/Debug/Framework-Debugging/certification.manifest
index 3735fb6146..84620e1e60 100644
--- a/Ghidra/Debug/Framework-Debugging/certification.manifest
+++ b/Ghidra/Debug/Framework-Debugging/certification.manifest
@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|
 src/test/resources/ghidra/dbg/model/test_schema.xml||GHIDRA||||END|
diff --git a/Ghidra/Debug/Framework-TraceModeling/certification.manifest b/Ghidra/Debug/Framework-TraceModeling/certification.manifest
index 5c54cc06d6..895ac4b698 100644
--- a/Ghidra/Debug/Framework-TraceModeling/certification.manifest
+++ b/Ghidra/Debug/Framework-TraceModeling/certification.manifest
@@ -1,4 +1,2 @@
 ##VERSION: 2.0
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
diff --git a/Ghidra/Debug/ProposedUtils/certification.manifest b/Ghidra/Debug/ProposedUtils/certification.manifest
index fa66778128..ab3e50857c 100644
--- a/Ghidra/Debug/ProposedUtils/certification.manifest
+++ b/Ghidra/Debug/ProposedUtils/certification.manifest
@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||NONE||reviewed||END|
-.project||NONE||reviewed||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|
diff --git a/Ghidra/Extensions/SleighDevTools/certification.manifest b/Ghidra/Extensions/SleighDevTools/certification.manifest
index 4dc3953d2b..8c9c5acfcf 100644
--- a/Ghidra/Extensions/SleighDevTools/certification.manifest
+++ b/Ghidra/Extensions/SleighDevTools/certification.manifest
@@ -1,5 +1,4 @@
 ##VERSION: 2.0
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|
 data/LanguageMap.txt||GHIDRA||||END|
diff --git a/Ghidra/Processors/HCS08/certification.manifest b/Ghidra/Processors/HCS08/certification.manifest
index 45829ad2f2..2a2f7ef95a 100644
--- a/Ghidra/Processors/HCS08/certification.manifest
+++ b/Ghidra/Processors/HCS08/certification.manifest
@@ -1,5 +1,4 @@
 ##VERSION: 2.0
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 data/languages/HC05-M68HC05TB.pspec||GHIDRA||||END|
 data/languages/HC05.ldefs||GHIDRA||||END|
diff --git a/Ghidra/Processors/HCS12/certification.manifest b/Ghidra/Processors/HCS12/certification.manifest
index f937883ee8..c4fed478ba 100644
--- a/Ghidra/Processors/HCS12/certification.manifest
+++ b/Ghidra/Processors/HCS12/certification.manifest
@@ -1,5 +1,4 @@
 ##VERSION: 2.0
-.project||NONE||||END|
 Module.manifest||GHIDRA||||END|
 data/build.xml||GHIDRA||||END|
 data/languages/HCS12.cspec||GHIDRA||||END|
diff --git a/Ghidra/Processors/M8C/certification.manifest b/Ghidra/Processors/M8C/certification.manifest
index 23e0908606..dbc7a5cec7 100644
--- a/Ghidra/Processors/M8C/certification.manifest
+++ b/Ghidra/Processors/M8C/certification.manifest
@@ -1,5 +1,4 @@
 ##VERSION: 2.0
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 data/build.xml||GHIDRA||||END|
 data/languages/m8c.cspec||GHIDRA||||END|
diff --git a/Ghidra/Processors/MCS96/certification.manifest b/Ghidra/Processors/MCS96/certification.manifest
index 58727804c3..5f9fa8c828 100644
--- a/Ghidra/Processors/MCS96/certification.manifest
+++ b/Ghidra/Processors/MCS96/certification.manifest
@@ -1,5 +1,4 @@
 ##VERSION: 2.0
-.project||NONE||||END|
 Module.manifest||GHIDRA||||END|
 data/build.xml||GHIDRA||||END|
 data/languages/MCS96.cspec||GHIDRA||||END|
diff --git a/Ghidra/Processors/SuperH4/certification.manifest b/Ghidra/Processors/SuperH4/certification.manifest
index aec5c94df1..e429b41142 100644
--- a/Ghidra/Processors/SuperH4/certification.manifest
+++ b/Ghidra/Processors/SuperH4/certification.manifest
@@ -1,5 +1,4 @@
 ##VERSION: 2.0
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 data/build.xml||GHIDRA||||END|
 data/languages/SuperH4.cspec||GHIDRA||||END|
diff --git a/Ghidra/Processors/tricore/certification.manifest b/Ghidra/Processors/tricore/certification.manifest
index 16fb071bb3..9f9ba7efa0 100644
--- a/Ghidra/Processors/tricore/certification.manifest
+++ b/Ghidra/Processors/tricore/certification.manifest
@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 data/build.xml||GHIDRA||||END|
 data/languages/tc172x.pspec||GHIDRA||||END|
diff --git a/GhidraDocs/certification.manifest b/GhidraDocs/certification.manifest
index 57bee25cd5..9b5eda28ab 100644
--- a/GhidraDocs/certification.manifest
+++ b/GhidraDocs/certification.manifest
@@ -6,7 +6,6 @@
 ##MODULE IP: Nuvola Icons - LGPL 2.1
 ##MODULE IP: Public Domain
 ##MODULE IP: Tango Icons - Public Domain
-.project||GHIDRA||||END|
 CheatSheet.html||GHIDRA||||END|
 GhidraClass/Advanced/Examples/Makefile||GHIDRA||||END|
 GhidraClass/Advanced/Examples/compilerVsDecompiler.s||GHIDRA||||END|
