diff --git a/.build/dependency-check-suppressions.xml b/.build/dependency-check-suppressions.xml
index 9a5da808fa..6df50e874a 100644
--- a/.build/dependency-check-suppressions.xml
+++ b/.build/dependency-check-suppressions.xml
@@ -49,4 +49,14 @@
         <cve>CVE-2022-42004</cve>
         <cve>CVE-2023-35116</cve>
     </suppress>
+
+    <!-- https://issues.apache.org/jira/browse/CASSANDRA-19142 -->
+    <suppress>
+        <packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-core@.*$</packageUrl>
+        <cve>CVE-2023-6378</cve>
+    </suppress>
+    <suppress>
+        <packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-classic@.*$</packageUrl>
+        <cve>CVE-2023-6378</cve>
+    </suppress>
 </suppressions>
diff --git a/CHANGES.txt b/CHANGES.txt
index 9b4900eb03..2602ec4b23 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -66,6 +66,11 @@ Merged from 4.0:
  * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844)
 Merged from 3.11:
 Merged from 3.0:
+<<<<<<< HEAD
+=======
+ * Suppress CVE-2023-6378 (CASSANDRA-19142) 
+ * Do not set RPC_READY to false on transports shutdown in order to not fail counter updates for deployments with coordinator and storage nodes with transports turned off (CASSANDRA-18935)
+>>>>>>> cassandra-4.1
  * Suppress CVE-2023-44487 (CASSANDRA-18943)
  * Implement the logic in bin/stop-server (CASSANDRA-18838)
  * Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip (CASSANDRA-18935)