diff --git a/CHANGES b/CHANGES
index 6be35d1aa1..0c3e968940 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+4.1.0-dev.704 | 2021-06-04 08:29:18 -0700
+
+  * Add deprecated headers for UDP and ICMP analyzers (Tim Wojtulewicz, Corelight)
+
+  * Fix handling of IP packets with bogus IP header lengths
+
+    Credit to OSS-Fuzz for discovery
+    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34711
+    (Link to details becomes public 30 days after patch release) (Tim Wojtulewicz, Corelight)
+
 4.1.0-dev.700 | 2021-06-03 09:27:57 -0700
 
   * Make update-traces fail when the curl invocation fails (Christian Kreibich, Corelight)
diff --git a/VERSION b/VERSION
index 4c20ea1a58..b46f9cccca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0-dev.700
+4.1.0-dev.704
diff --git a/src/analyzer/protocol/icmp/ICMP.h b/src/analyzer/protocol/icmp/ICMP.h
new file mode 100644
index 0000000000..6d9f1be4d5
--- /dev/null
+++ b/src/analyzer/protocol/icmp/ICMP.h
@@ -0,0 +1,15 @@
+#warning "Remove in v5.1. This analyzer has been moved to packet analysis, use 'zeek/packet_analysis/protocol/icmp/ICMPSessionAdapter.h' and/or 'zeek/packet_analysis/protocol/icmp/ICMP.h'."
+
+#include "zeek/packet_analysis/protocol/icmp/ICMPSessionAdapter.h"
+#include "zeek/packet_analysis/protocol/icmp/ICMP.h"
+
+namespace zeek::analyzer::icmp {
+
+using ICMP_Analyzer [[deprecated("Remove in v5.1. Use zeek::packet_analysis::ICMP::ICMPSessionAdapter.")]] =
+	zeek::packet_analysis::ICMP::ICMPSessionAdapter;
+constexpr auto ICMP4_counterpart [[deprecated("Remove in v5.1. Use zeek::packet_analysis::ICMP::ICMP4_counterpart.")]] =
+	zeek::packet_analysis::ICMP::ICMP4_counterpart;
+constexpr auto ICMP6_counterpart [[deprecated("Remove in v5.1. Use zeek::packet_analysis::ICMP::ICMP6_counterpart.")]] =
+	zeek::packet_analysis::ICMP::ICMP6_counterpart;
+
+} // namespace zeek::analyzer::icmp
diff --git a/src/analyzer/protocol/tcp/TCP.h b/src/analyzer/protocol/tcp/TCP.h
index 8fa5331652..dd94646867 100644
--- a/src/analyzer/protocol/tcp/TCP.h
+++ b/src/analyzer/protocol/tcp/TCP.h
@@ -10,7 +10,6 @@
 #include "zeek/Conn.h"
 
 namespace zeek::analyzer::pia { class PIA_TCP; }
-namespace zeek::packet_analysis::TCP { class TCPSessionAdapter; }
 
 namespace zeek::analyzer::tcp {
 
diff --git a/src/analyzer/protocol/udp/UDP.h b/src/analyzer/protocol/udp/UDP.h
new file mode 100644
index 0000000000..4beceeccd4
--- /dev/null
+++ b/src/analyzer/protocol/udp/UDP.h
@@ -0,0 +1,10 @@
+#warning "Remove in v5.1. This analyzer has been moved to packet analysis, use 'zeek/packet_analysis/protocol/udp/UDPSessionAdapter.h'."
+
+#include "zeek/packet_analysis/protocol/udp/UDPSessionAdapter.h"
+
+namespace zeek::analyzer::udp {
+
+using UDP_Analyzer [[deprecated("Remove in v5.1. Use zeek::packet_analysis::UDP::UDPSessionAdapter.")]] =
+	zeek::packet_analysis::UDP::UDPSessionAdapter;
+
+} // namespace zeek::analyzer::udp