diff --git a/CHANGES.md b/CHANGES.md
index c1a9034..805c0d9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,8 +17,9 @@
 
 ### C++
 
-- [THRIFT-5456](https://issues.apache.org/jira/browse/THRIFT-5456) - ServerSocket doesn't ignore SIGPIPE
 - [THRIFT-5187](https://issues.apache.org/jira/browse/THRIFT-5187) - Add support for Unix domain sockets on Windows 10 or later
+- [THRIFT-5418](https://issues.apache.org/jira/browse/THRIFT-5418) - C++ to_string and ostream operator not always generated
+- [THRIFT-5456](https://issues.apache.org/jira/browse/THRIFT-5456) - ServerSocket doesn't ignore SIGPIPE
 
 ### Common LISP
 
@@ -31,8 +32,9 @@
 ### Go
 
 - [THRIFT-5461](https://issues.apache.org/jira/browse/THRIFT-5461) - Invalid golang code generated for optional set<binary> with a default value
-- [THRIFT-5490](https://issues.apache.org/jira/browse/THRIFT-5490) - Improve memory efficiency in go THeader implementation
 - [THRIFT-5469](https://issues.apache.org/jira/browse/THRIFT-5469) - Go lib skip map value may cause stack overflow
+- [THRIFT-5490](https://issues.apache.org/jira/browse/THRIFT-5490) - Improve memory efficiency in go THeader implementation
+- [THRIFT-5509](https://issues.apache.org/jira/browse/THRIFT-5509) - Potential connection leaks caused by the connectivity check
 
 ### Haxe
 
@@ -40,8 +42,9 @@
 
 ### Java
 
-- [THRIFT-5486](https://issues.apache.org/jira/browse/THRIFT-5486) - fix issues found by spotbugs 
 - [THRIFT-5443](https://issues.apache.org/jira/browse/THRIFT-5443) - add support for partial deserialization of Thrift
+- [THRIFT-5486](https://issues.apache.org/jira/browse/THRIFT-5486) - fix issues found by spotbugs 
+- [THRIFT-5512](https://issues.apache.org/jira/browse/THRIFT-5512) - Update java dependencies
 
 ### JavaScript
 
@@ -49,27 +52,28 @@
 
 ### netstd
 
-- [THRIFT-5500](https://issues.apache.org/jira/browse/THRIFT-5500) - Uncompilable code when .thrift struct 'System' exists
-- [THRIFT-5479](https://issues.apache.org/jira/browse/THRIFT-5479) - Add net 6 support
-- [THRIFT-5408](https://issues.apache.org/jira/browse/THRIFT-5408) - Support for deprecated methods (via annotation)
-- [THRIFT-5481](https://issues.apache.org/jira/browse/THRIFT-5481) - consolidate netstd server implementation details into one common model
-- [THRIFT-5480](https://issues.apache.org/jira/browse/THRIFT-5480) - TThreadPoolAsyncServer using TFramedTransport mistakenly drops client
 - [THRIFT-5401](https://issues.apache.org/jira/browse/THRIFT-5401) - MaxMessageSize reached exception thrown in TEndpointTransport
+- [THRIFT-5408](https://issues.apache.org/jira/browse/THRIFT-5408) - Support for deprecated methods (via annotation)
+- [THRIFT-5479](https://issues.apache.org/jira/browse/THRIFT-5479) - Add net 6 support
+- [THRIFT-5480](https://issues.apache.org/jira/browse/THRIFT-5480) - TThreadPoolAsyncServer using TFramedTransport mistakenly drops client
+- [THRIFT-5481](https://issues.apache.org/jira/browse/THRIFT-5481) - consolidate netstd server implementation details into one common model
+- [THRIFT-5500](https://issues.apache.org/jira/browse/THRIFT-5500) - Uncompilable code when .thrift struct 'System' exists
+- [THRIFT-5504](https://issues.apache.org/jira/browse/THRIFT-5504) - CA2254 Message template should be compile time constant
 
 ### Perl
 
-- [THRIFT-5416](https://issues.apache.org/jira/browse/THRIFT-5416) - Allow UDP Socket Client In Perl
 - [THRIFT-5055](https://issues.apache.org/jira/browse/THRIFT-5055) - Fix build-cpan-dist.sh to create a CPAN distribution correctly
+- [THRIFT-5416](https://issues.apache.org/jira/browse/THRIFT-5416) - Allow UDP Socket Client In Perl
 
 ### Python
 
-- [THRIFT-5488](https://issues.apache.org/jira/browse/THRIFT-5488) - SystemError when using fast binary or compact protocol in python 3.10
 - [THRIFT-5454](https://issues.apache.org/jira/browse/THRIFT-5454) - Python TProcessPoolServer does not spawn expected number of worker processes
+- [THRIFT-5488](https://issues.apache.org/jira/browse/THRIFT-5488) - SystemError when using fast binary or compact protocol in python 3.10
 
 ### Rust
 
-- [THRIFT-5457](https://issues.apache.org/jira/browse/THRIFT-5457) - Travis fails consistently on a Rust dependency
 - [THRIFT-5452](https://issues.apache.org/jira/browse/THRIFT-5452) - Make server optional
+- [THRIFT-5457](https://issues.apache.org/jira/browse/THRIFT-5457) - Travis fails consistently on a Rust dependency
 
 ### Test Suite
 
diff --git a/Makefile.am b/Makefile.am
index a132209..0fe065f 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -156,6 +156,8 @@
 	doap.rdf \
 	doc \
 	dub.json \
+	go.mod \
+	go.sum \
 	jitpack.yml \
 	LANGUAGES.md \
 	LICENSE \
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index cd0f33c..4b3ecda 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -127,6 +127,8 @@
 	ConflictNamespaceTestB.thrift \
 	ConflictNamespaceTestC.thrift \
 	ConflictNamespaceTestD.thrift \
+	ConflictNamespaceTestE.thrift \
+	ConflictNamespaceTestF.thrift \
 	ConflictNamespaceTestSuperThing.thrift \
 	ConstOptionalField.thrift \
 	ConstOptionalFieldImport.thrift \
diff --git a/lib/go/test/fuzz/Makefile.am b/lib/go/test/fuzz/Makefile.am
index a6abfc5..391c84a 100644
--- a/lib/go/test/fuzz/Makefile.am
+++ b/lib/go/test/fuzz/Makefile.am
@@ -29,3 +29,8 @@
 clean-local:
 	$(RM) -r gopathfuzz gen-go
 
+EXTRA_DIST = \
+	fuzz.go \
+	fuzz_test.go \
+	go.mod \
+	go.sum 
diff --git a/lib/netstd/Makefile.am b/lib/netstd/Makefile.am
index f1a87a2..47b3803 100644
--- a/lib/netstd/Makefile.am
+++ b/lib/netstd/Makefile.am
@@ -53,12 +53,15 @@
 	Tests/Thrift.Tests/Collections \
 	Tests/Thrift.Tests/DataModel \
 	Tests/Thrift.Tests/Protocols \
+	Tests/Thrift.Tests/Transports \
 	Tests/Thrift.Tests/Thrift.Tests.csproj \
+	Thrift/.editorconfig \
 	Thrift/Collections \
 	Thrift/Processor \
 	Thrift/Properties \
 	Thrift/Protocol \
 	Thrift/Server \
+	Thrift/GlobalSuppressions.cs \
 	Thrift/TApplicationException.cs \
 	Thrift/TBaseClient.cs \
 	Thrift/TConfiguration.cs \
diff --git a/lib/php/Makefile.am b/lib/php/Makefile.am
index 1857d03..4ec6be3 100755
--- a/lib/php/Makefile.am
+++ b/lib/php/Makefile.am
@@ -140,6 +140,8 @@
 	src/ext/thrift_protocol/config.w32 \
 	src/ext/thrift_protocol/php_thrift_protocol.cpp \
 	src/ext/thrift_protocol/php_thrift_protocol.h \
+	src/ext/thrift_protocol/php_thrift_protocol.stub.php \
+	src/ext/thrift_protocol/php_thrift_protocol_arginfo.h \
 	src/Thrift.php \
 	src/TStringUtils.php \
 	coding_standards.md \
diff --git a/lib/rs/test_recursive/src/Makefile.am b/lib/rs/test_recursive/src/Makefile.am
index c21a94c..4bfd557 100644
--- a/lib/rs/test_recursive/src/Makefile.am
+++ b/lib/rs/test_recursive/src/Makefile.am
@@ -30,4 +30,5 @@
 	-$(RM) vehicles.rs
 
 EXTRA_DIST = \
+	lib.rs \
 	Vehicles.thrift
diff --git a/lib/rs/test_recursive/src/maintenance/Makefile.am b/lib/rs/test_recursive/src/maintenance/Makefile.am
index c24813a..e2526bd 100644
--- a/lib/rs/test_recursive/src/maintenance/Makefile.am
+++ b/lib/rs/test_recursive/src/maintenance/Makefile.am
@@ -30,4 +30,5 @@
 	-$(RM) maintenance_facility.rs
 
 EXTRA_DIST = \
+	mod.rs \
 	MaintenanceFacility.thrift
diff --git a/lib/rs/test_recursive/src/transit/Makefile.am b/lib/rs/test_recursive/src/transit/Makefile.am
index 7318265..908becb 100644
--- a/lib/rs/test_recursive/src/transit/Makefile.am
+++ b/lib/rs/test_recursive/src/transit/Makefile.am
@@ -35,6 +35,7 @@
 	-$(RM) transporters.rs
 
 EXTRA_DIST = \
+	mod.rs \
 	Buses.thrift \
 	Trains.thrift \
 	Transporters.thrift
diff --git a/lib/rs/test_recursive/src/transit/light/Makefile.am b/lib/rs/test_recursive/src/transit/light/Makefile.am
index c09c39d..88fd531 100644
--- a/lib/rs/test_recursive/src/transit/light/Makefile.am
+++ b/lib/rs/test_recursive/src/transit/light/Makefile.am
@@ -32,5 +32,6 @@
 	-$(RM) streetcars.rs
 
 EXTRA_DIST = \
+	mod.rs \
 	LightRail.thrift \
 	Streetcars.thrift
diff --git a/lib/rs/test_recursive/src/transit/services/Makefile.am b/lib/rs/test_recursive/src/transit/services/Makefile.am
index f70e919..12e9e29 100644
--- a/lib/rs/test_recursive/src/transit/services/Makefile.am
+++ b/lib/rs/test_recursive/src/transit/services/Makefile.am
@@ -30,4 +30,5 @@
 	-$(RM) city_services.rs
 
 EXTRA_DIST = \
+	mod.rs \
 	CityServices.thrift
diff --git a/test/Makefile.am b/test/Makefile.am
index 5b9c1ce..2199f1e 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -134,6 +134,7 @@
 	rb \
 	rs \
 	threads \
+	partial \
 	AnnotationTest.thrift \
 	BrokenConstants.thrift \
 	ConstantsDemo.thrift \