diff --git a/FreeRTOS_ARP.c b/FreeRTOS_ARP.c
index a9a3cd22d..9d2a6a3fe 100644
--- a/FreeRTOS_ARP.c
+++ b/FreeRTOS_ARP.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/FreeRTOS_DHCP.c b/FreeRTOS_DHCP.c
index 66632fff9..a2d763844 100644
--- a/FreeRTOS_DHCP.c
+++ b/FreeRTOS_DHCP.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/FreeRTOS_DNS.c b/FreeRTOS_DNS.c
index 7228808dc..eb0cbb37f 100644
--- a/FreeRTOS_DNS.c
+++ b/FreeRTOS_DNS.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/FreeRTOS_IP.c b/FreeRTOS_IP.c
index 518693392..299c118b6 100644
--- a/FreeRTOS_IP.c
+++ b/FreeRTOS_IP.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/FreeRTOS_Sockets.c b/FreeRTOS_Sockets.c
index 319e651a9..072a95d1d 100644
--- a/FreeRTOS_Sockets.c
+++ b/FreeRTOS_Sockets.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/FreeRTOS_Stream_Buffer.c b/FreeRTOS_Stream_Buffer.c
index ce71ec977..58f17b112 100644
--- a/FreeRTOS_Stream_Buffer.c
+++ b/FreeRTOS_Stream_Buffer.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/FreeRTOS_TCP_IP.c b/FreeRTOS_TCP_IP.c
index 9a576f000..7cb816d17 100644
--- a/FreeRTOS_TCP_IP.c
+++ b/FreeRTOS_TCP_IP.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/FreeRTOS_TCP_WIN.c b/FreeRTOS_TCP_WIN.c
index 0cef49fd2..085ee0273 100644
--- a/FreeRTOS_TCP_WIN.c
+++ b/FreeRTOS_TCP_WIN.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/FreeRTOS_UDP_IP.c b/FreeRTOS_UDP_IP.c
index 2595dbf4b..59b7f4183 100644
--- a/FreeRTOS_UDP_IP.c
+++ b/FreeRTOS_UDP_IP.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/History.txt b/History.txt
index 7b9ea8a7e..fd2e656ee 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,10 @@
+Changes between V2.3.4 and V2.4.0 releases:
+        + Updated the maximum limit on the number of bytes which can be requested
+          when using BufferAllocation2.c
+        + Improved MISRA compliance.
+        + Added minor bug fixes to various network interfaces.
+        + Improved RFC Compliance.
+
 Changes between V2.3.3 and V2.3.4 releases:
         + Added a check in BufferAllocation_2.c to ensure adding (2 +
           ipBUFFER_PADDING) bytes to the requested allocation size does
diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile
index 5911026c2..024815dff 100644
--- a/docs/doxygen/config.doxyfile
+++ b/docs/doxygen/config.doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = FreeRTOS-Plus-TCP
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = V2.3.4
+PROJECT_NUMBER         = V2.4.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/include/FreeRTOSIPConfigDefaults.h b/include/FreeRTOSIPConfigDefaults.h
index 4eb5079a6..ae2a22a0b 100644
--- a/include/FreeRTOSIPConfigDefaults.h
+++ b/include/FreeRTOSIPConfigDefaults.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_ARP.h b/include/FreeRTOS_ARP.h
index 841d7e3a9..2c6cc6672 100644
--- a/include/FreeRTOS_ARP.h
+++ b/include/FreeRTOS_ARP.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_DHCP.h b/include/FreeRTOS_DHCP.h
index f29e9629c..cb9372096 100644
--- a/include/FreeRTOS_DHCP.h
+++ b/include/FreeRTOS_DHCP.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_DNS.h b/include/FreeRTOS_DNS.h
index ef6521695..885d8b93d 100644
--- a/include/FreeRTOS_DNS.h
+++ b/include/FreeRTOS_DNS.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_IP.h b/include/FreeRTOS_IP.h
index 1e86e8021..3410d8fae 100644
--- a/include/FreeRTOS_IP.h
+++ b/include/FreeRTOS_IP.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -40,7 +40,7 @@
 
 /* Constants defining the current version of the FreeRTOS+TCP
  * network stack. */
-    #define ipFR_TCP_VERSION_NUMBER    "V2.3.4"
+    #define ipFR_TCP_VERSION_NUMBER    "V2.4.0"
     #define ipFR_TCP_VERSION_MAJOR     2
     #define ipFR_TCP_VERSION_MINOR     3
     #define ipFR_TCP_VERSION_BUILD     4
diff --git a/include/FreeRTOS_IP_Private.h b/include/FreeRTOS_IP_Private.h
index 3b2091966..b0a8885f9 100644
--- a/include/FreeRTOS_IP_Private.h
+++ b/include/FreeRTOS_IP_Private.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_Sockets.h b/include/FreeRTOS_Sockets.h
index 380653172..990f69d0d 100644
--- a/include/FreeRTOS_Sockets.h
+++ b/include/FreeRTOS_Sockets.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_Stream_Buffer.h b/include/FreeRTOS_Stream_Buffer.h
index cfa63dbfe..049e27a37 100644
--- a/include/FreeRTOS_Stream_Buffer.h
+++ b/include/FreeRTOS_Stream_Buffer.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_TCP_IP.h b/include/FreeRTOS_TCP_IP.h
index b0dd931ed..e6ecd1c1f 100644
--- a/include/FreeRTOS_TCP_IP.h
+++ b/include/FreeRTOS_TCP_IP.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_TCP_WIN.h b/include/FreeRTOS_TCP_WIN.h
index 3f4fb56ec..209e39e98 100644
--- a/include/FreeRTOS_TCP_WIN.h
+++ b/include/FreeRTOS_TCP_WIN.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_UDP_IP.h b/include/FreeRTOS_UDP_IP.h
index ce16b2684..aee3fcdef 100644
--- a/include/FreeRTOS_UDP_IP.h
+++ b/include/FreeRTOS_UDP_IP.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/FreeRTOS_errno_TCP.h b/include/FreeRTOS_errno_TCP.h
index 95fad80d2..19c5cf31d 100644
--- a/include/FreeRTOS_errno_TCP.h
+++ b/include/FreeRTOS_errno_TCP.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/IPTraceMacroDefaults.h b/include/IPTraceMacroDefaults.h
index e6ca2ea14..a24002c03 100644
--- a/include/IPTraceMacroDefaults.h
+++ b/include/IPTraceMacroDefaults.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/NetworkBufferManagement.h b/include/NetworkBufferManagement.h
index e6e38d97e..e63d66a12 100644
--- a/include/NetworkBufferManagement.h
+++ b/include/NetworkBufferManagement.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/include/NetworkInterface.h b/include/NetworkInterface.h
index 6271d2f13..0a9d15f74 100644
--- a/include/NetworkInterface.h
+++ b/include/NetworkInterface.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/manifest.yml b/manifest.yml
index d00808003..9141a9b85 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,11 +1,11 @@
 name : "FreeRTOS-Plus-TCP"
-version: "V2.3.4"
+version: "V2.4.0"
 description: |-
   "Thread safe FreeRTOS TCP/IP stack working on top of the FreeRTOS-Kernel to implement the TCP/IP protocol. Suitable for microcontrollers."
 
 dependencies:
   - name: "FreeRTOS-Kernel"
-    version: "V10.4.5"
+    version: "V10.4.6"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/FreeRTOS-Kernel"
diff --git a/portable/BufferManagement/BufferAllocation_1.c b/portable/BufferManagement/BufferAllocation_1.c
index 9b6451de6..715f7747b 100644
--- a/portable/BufferManagement/BufferAllocation_1.c
+++ b/portable/BufferManagement/BufferAllocation_1.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/BufferManagement/BufferAllocation_2.c b/portable/BufferManagement/BufferAllocation_2.c
index b064bbf3e..4bfe18eaa 100644
--- a/portable/BufferManagement/BufferAllocation_2.c
+++ b/portable/BufferManagement/BufferAllocation_2.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/CompilerName/pack_struct_end.h b/portable/Compiler/CompilerName/pack_struct_end.h
index 5c8b906b8..0292665b9 100644
--- a/portable/Compiler/CompilerName/pack_struct_end.h
+++ b/portable/Compiler/CompilerName/pack_struct_end.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/CompilerName/pack_struct_start.h b/portable/Compiler/CompilerName/pack_struct_start.h
index 4b8dc7860..43cb49094 100644
--- a/portable/Compiler/CompilerName/pack_struct_start.h
+++ b/portable/Compiler/CompilerName/pack_struct_start.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/GCC/pack_struct_end.h b/portable/Compiler/GCC/pack_struct_end.h
index 2665d32c3..abb7b84f2 100644
--- a/portable/Compiler/GCC/pack_struct_end.h
+++ b/portable/Compiler/GCC/pack_struct_end.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/GCC/pack_struct_start.h b/portable/Compiler/GCC/pack_struct_start.h
index 701f41e0d..55c04cc70 100644
--- a/portable/Compiler/GCC/pack_struct_start.h
+++ b/portable/Compiler/GCC/pack_struct_start.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/IAR/pack_struct_end.h b/portable/Compiler/IAR/pack_struct_end.h
index b152d40cf..f871155a4 100644
--- a/portable/Compiler/IAR/pack_struct_end.h
+++ b/portable/Compiler/IAR/pack_struct_end.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/IAR/pack_struct_start.h b/portable/Compiler/IAR/pack_struct_start.h
index 87e773376..efc1a567e 100644
--- a/portable/Compiler/IAR/pack_struct_start.h
+++ b/portable/Compiler/IAR/pack_struct_start.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/Keil/pack_struct_end.h b/portable/Compiler/Keil/pack_struct_end.h
index 5070be794..913ccc125 100644
--- a/portable/Compiler/Keil/pack_struct_end.h
+++ b/portable/Compiler/Keil/pack_struct_end.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/Keil/pack_struct_start.h b/portable/Compiler/Keil/pack_struct_start.h
index c2787c5b3..68679cd15 100644
--- a/portable/Compiler/Keil/pack_struct_start.h
+++ b/portable/Compiler/Keil/pack_struct_start.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/MSVC/pack_struct_end.h b/portable/Compiler/MSVC/pack_struct_end.h
index 1fe0e3590..c4f7c58b8 100644
--- a/portable/Compiler/MSVC/pack_struct_end.h
+++ b/portable/Compiler/MSVC/pack_struct_end.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/MSVC/pack_struct_start.h b/portable/Compiler/MSVC/pack_struct_start.h
index d8354073b..51d799b93 100644
--- a/portable/Compiler/MSVC/pack_struct_start.h
+++ b/portable/Compiler/MSVC/pack_struct_start.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/Renesas/pack_struct_end.h b/portable/Compiler/Renesas/pack_struct_end.h
index dc075b455..cc88ea7f2 100644
--- a/portable/Compiler/Renesas/pack_struct_end.h
+++ b/portable/Compiler/Renesas/pack_struct_end.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/Compiler/Renesas/pack_struct_start.h b/portable/Compiler/Renesas/pack_struct_start.h
index 32d8d8ba9..191735a33 100644
--- a/portable/Compiler/Renesas/pack_struct_start.h
+++ b/portable/Compiler/Renesas/pack_struct_start.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/ATSAM4E/NetworkInterface.c b/portable/NetworkInterface/ATSAM4E/NetworkInterface.c
index 3857fe5f8..5fddfb279 100644
--- a/portable/NetworkInterface/ATSAM4E/NetworkInterface.c
+++ b/portable/NetworkInterface/ATSAM4E/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/ATSAME5x/NetworkInterface.c b/portable/NetworkInterface/ATSAME5x/NetworkInterface.c
index 41a881905..be0172312 100644
--- a/portable/NetworkInterface/ATSAME5x/NetworkInterface.c
+++ b/portable/NetworkInterface/ATSAME5x/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/Common/phyHandling.c b/portable/NetworkInterface/Common/phyHandling.c
index ccbfafee7..dc939668f 100644
--- a/portable/NetworkInterface/Common/phyHandling.c
+++ b/portable/NetworkInterface/Common/phyHandling.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/DriverSAM/NetworkInterface.c b/portable/NetworkInterface/DriverSAM/NetworkInterface.c
index 99d97c965..9188830ac 100644
--- a/portable/NetworkInterface/DriverSAM/NetworkInterface.c
+++ b/portable/NetworkInterface/DriverSAM/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/LPC17xx/NetworkInterface.c b/portable/NetworkInterface/LPC17xx/NetworkInterface.c
index 84de1df2b..68cae5670 100644
--- a/portable/NetworkInterface/LPC17xx/NetworkInterface.c
+++ b/portable/NetworkInterface/LPC17xx/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/LPC18xx/NetworkInterface.c b/portable/NetworkInterface/LPC18xx/NetworkInterface.c
index 4997c1e2a..0b7ba364c 100644
--- a/portable/NetworkInterface/LPC18xx/NetworkInterface.c
+++ b/portable/NetworkInterface/LPC18xx/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/LPC54018/NetworkInterface.c b/portable/NetworkInterface/LPC54018/NetworkInterface.c
index d93b150ae..1fe868cae 100644
--- a/portable/NetworkInterface/LPC54018/NetworkInterface.c
+++ b/portable/NetworkInterface/LPC54018/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/M487/NetworkInterface.c b/portable/NetworkInterface/M487/NetworkInterface.c
index ea5eb2ae8..78fa401c7 100644
--- a/portable/NetworkInterface/M487/NetworkInterface.c
+++ b/portable/NetworkInterface/M487/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c b/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c
index 6248b8bbe..6bbf4c430 100644
--- a/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c
+++ b/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/SH2A/NetworkInterface.c b/portable/NetworkInterface/SH2A/NetworkInterface.c
index 09397cf37..57c94f2ac 100644
--- a/portable/NetworkInterface/SH2A/NetworkInterface.c
+++ b/portable/NetworkInterface/SH2A/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/STM32Fxx/NetworkInterface.c b/portable/NetworkInterface/STM32Fxx/NetworkInterface.c
index 1dfdb5007..961d35a27 100644
--- a/portable/NetworkInterface/STM32Fxx/NetworkInterface.c
+++ b/portable/NetworkInterface/STM32Fxx/NetworkInterface.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/STM32Hxx/NetworkInterface.c b/portable/NetworkInterface/STM32Hxx/NetworkInterface.c
index 46c10ef27..23d832611 100644
--- a/portable/NetworkInterface/STM32Hxx/NetworkInterface.c
+++ b/portable/NetworkInterface/STM32Hxx/NetworkInterface.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.c b/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.c
index b1afd22f2..71033b06a 100644
--- a/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.c
+++ b/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Driver code:
diff --git a/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.h b/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.h
index f708c0c87..c602c6484 100644
--- a/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.h
+++ b/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Driver code:
diff --git a/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.c b/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.c
index 36ed2d83f..829bc4175 100644
--- a/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.c
+++ b/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Driver code:
diff --git a/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.h b/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.h
index 85a6e4cbc..a4d781c3f 100644
--- a/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.h
+++ b/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Driver code:
diff --git a/portable/NetworkInterface/WinPCap/NetworkInterface.c b/portable/NetworkInterface/WinPCap/NetworkInterface.c
index 80231c825..8cc5caf61 100644
--- a/portable/NetworkInterface/WinPCap/NetworkInterface.c
+++ b/portable/NetworkInterface/WinPCap/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/Zynq/NetworkInterface.c b/portable/NetworkInterface/Zynq/NetworkInterface.c
index 8cfede33e..93098751d 100644
--- a/portable/NetworkInterface/Zynq/NetworkInterface.c
+++ b/portable/NetworkInterface/Zynq/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/Zynq/uncached_memory.c b/portable/NetworkInterface/Zynq/uncached_memory.c
index 05ce0e7b7..e801783e0 100644
--- a/portable/NetworkInterface/Zynq/uncached_memory.c
+++ b/portable/NetworkInterface/Zynq/uncached_memory.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/Zynq/x_emacpsif_dma.c b/portable/NetworkInterface/Zynq/x_emacpsif_dma.c
index 0187f704c..43bf4a7a5 100644
--- a/portable/NetworkInterface/Zynq/x_emacpsif_dma.c
+++ b/portable/NetworkInterface/Zynq/x_emacpsif_dma.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/board_family/NetworkInterface.c b/portable/NetworkInterface/board_family/NetworkInterface.c
index 01de7b088..3713bf02f 100644
--- a/portable/NetworkInterface/board_family/NetworkInterface.c
+++ b/portable/NetworkInterface/board_family/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/include/phyHandling.h b/portable/NetworkInterface/include/phyHandling.h
index 2807dd541..f81a8cfee 100644
--- a/portable/NetworkInterface/include/phyHandling.h
+++ b/portable/NetworkInterface/include/phyHandling.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/ksz8851snl/NetworkInterface.c b/portable/NetworkInterface/ksz8851snl/NetworkInterface.c
index c834f4506..cda16ef9c 100644
--- a/portable/NetworkInterface/ksz8851snl/NetworkInterface.c
+++ b/portable/NetworkInterface/ksz8851snl/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/linux/NetworkInterface.c b/portable/NetworkInterface/linux/NetworkInterface.c
index cf228119f..d8c3ecfb6 100644
--- a/portable/NetworkInterface/linux/NetworkInterface.c
+++ b/portable/NetworkInterface/linux/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/mw300_rd/NetworkInterface.c b/portable/NetworkInterface/mw300_rd/NetworkInterface.c
index 30d94a4c4..e9ad2ac58 100644
--- a/portable/NetworkInterface/mw300_rd/NetworkInterface.c
+++ b/portable/NetworkInterface/mw300_rd/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/pic32mzef/BufferAllocation_2.c b/portable/NetworkInterface/pic32mzef/BufferAllocation_2.c
index 42a0ca723..58e184a32 100644
--- a/portable/NetworkInterface/pic32mzef/BufferAllocation_2.c
+++ b/portable/NetworkInterface/pic32mzef/BufferAllocation_2.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/xilinx_ultrascale/NetworkInterface.c b/portable/NetworkInterface/xilinx_ultrascale/NetworkInterface.c
index 10a4ed448..e7ac5a1c3 100644
--- a/portable/NetworkInterface/xilinx_ultrascale/NetworkInterface.c
+++ b/portable/NetworkInterface/xilinx_ultrascale/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/xilinx_ultrascale/uncached_memory.c b/portable/NetworkInterface/xilinx_ultrascale/uncached_memory.c
index b78335476..06a7a9361 100644
--- a/portable/NetworkInterface/xilinx_ultrascale/uncached_memory.c
+++ b/portable/NetworkInterface/xilinx_ultrascale/uncached_memory.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c b/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c
index a9b06e531..abd9e02e9 100644
--- a/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c
+++ b/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/Coverity/ConfigFiles/pack_struct_end.h b/test/Coverity/ConfigFiles/pack_struct_end.h
index 1bfbdac67..1902b0e9b 100644
--- a/test/Coverity/ConfigFiles/pack_struct_end.h
+++ b/test/Coverity/ConfigFiles/pack_struct_end.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/Coverity/ConfigFiles/pack_struct_start.h b/test/Coverity/ConfigFiles/pack_struct_start.h
index 701f41e0d..55c04cc70 100644
--- a/test/Coverity/ConfigFiles/pack_struct_start.h
+++ b/test/Coverity/ConfigFiles/pack_struct_start.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/FreeRTOS-Kernel b/test/FreeRTOS-Kernel
index cb0757ee0..a4b28e351 160000
--- a/test/FreeRTOS-Kernel
+++ b/test/FreeRTOS-Kernel
@@ -1 +1 @@
-Subproject commit cb0757ee0b8894090b82e75e83942e3c61a32245
+Subproject commit a4b28e35103d699edf074dfff4835921b481b301
diff --git a/test/build-combination/Common/main.c b/test/build-combination/Common/main.c
index 631704e07..e3fd875fc 100644
--- a/test/build-combination/Common/main.c
+++ b/test/build-combination/Common/main.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/ConfigFiles/FreeRTOS_errno_TCP.h b/test/unit-test/ConfigFiles/FreeRTOS_errno_TCP.h
index 7d9d317a2..a19d22a65 100644
--- a/test/unit-test/ConfigFiles/FreeRTOS_errno_TCP.h
+++ b/test/unit-test/ConfigFiles/FreeRTOS_errno_TCP.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/ConfigFiles/IPTraceMacroDefaults.h b/test/unit-test/ConfigFiles/IPTraceMacroDefaults.h
index 509a73fc7..45905bf0b 100644
--- a/test/unit-test/ConfigFiles/IPTraceMacroDefaults.h
+++ b/test/unit-test/ConfigFiles/IPTraceMacroDefaults.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/ConfigFiles/NetworkBufferManagement.h b/test/unit-test/ConfigFiles/NetworkBufferManagement.h
index b9f3c0c8f..a952c9943 100644
--- a/test/unit-test/ConfigFiles/NetworkBufferManagement.h
+++ b/test/unit-test/ConfigFiles/NetworkBufferManagement.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/ConfigFiles/NetworkInterface.h b/test/unit-test/ConfigFiles/NetworkInterface.h
index 0699b6f7f..74f0e8a6a 100644
--- a/test/unit-test/ConfigFiles/NetworkInterface.h
+++ b/test/unit-test/ConfigFiles/NetworkInterface.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/ConfigFiles/pack_struct_end.h b/test/unit-test/ConfigFiles/pack_struct_end.h
index 2665d32c3..abb7b84f2 100644
--- a/test/unit-test/ConfigFiles/pack_struct_end.h
+++ b/test/unit-test/ConfigFiles/pack_struct_end.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/ConfigFiles/pack_struct_start.h b/test/unit-test/ConfigFiles/pack_struct_start.h
index 701f41e0d..55c04cc70 100644
--- a/test/unit-test/ConfigFiles/pack_struct_start.h
+++ b/test/unit-test/ConfigFiles/pack_struct_start.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c
index fa9f067ff..ec256633a 100644
--- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c
+++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_utest.c
index c198b51b4..8bfe1bcf7 100644
--- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_utest.c
+++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_utest.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h b/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h
index b77a20dcd..f4ac749a6 100644
--- a/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h
+++ b/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c
index 26bb508fc..ae9e30ee8 100644
--- a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c
+++ b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/list_macros.h b/test/unit-test/FreeRTOS_Stream_Buffer/list_macros.h
index b77a20dcd..f4ac749a6 100644
--- a/test/unit-test/FreeRTOS_Stream_Buffer/list_macros.h
+++ b/test/unit-test/FreeRTOS_Stream_Buffer/list_macros.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_stubs.c b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_stubs.c
index c476534da..89ee56d4f 100644
--- a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_stubs.c
+++ b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_stubs.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c
index b04e3bef2..0122fb706 100644
--- a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c
+++ b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/FreeRTOS_UDP_IP/list_macros.h b/test/unit-test/FreeRTOS_UDP_IP/list_macros.h
index b77a20dcd..f4ac749a6 100644
--- a/test/unit-test/FreeRTOS_UDP_IP/list_macros.h
+++ b/test/unit-test/FreeRTOS_UDP_IP/list_macros.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/tools/tcp_utilities/include/tcp_dump_packets.h b/tools/tcp_utilities/include/tcp_dump_packets.h
index c886fd155..29ae3c2c6 100644
--- a/tools/tcp_utilities/include/tcp_dump_packets.h
+++ b/tools/tcp_utilities/include/tcp_dump_packets.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/tools/tcp_utilities/include/tcp_mem_stats.h b/tools/tcp_utilities/include/tcp_mem_stats.h
index c212f7b73..b4aadd618 100644
--- a/tools/tcp_utilities/include/tcp_mem_stats.h
+++ b/tools/tcp_utilities/include/tcp_mem_stats.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/tools/tcp_utilities/include/tcp_netstat.h b/tools/tcp_utilities/include/tcp_netstat.h
index 6a71ba8ca..fdb3fdf5f 100644
--- a/tools/tcp_utilities/include/tcp_netstat.h
+++ b/tools/tcp_utilities/include/tcp_netstat.h
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/tools/tcp_utilities/tcp_dump_packets.c b/tools/tcp_utilities/tcp_dump_packets.c
index efddc3d32..3d0c9a158 100644
--- a/tools/tcp_utilities/tcp_dump_packets.c
+++ b/tools/tcp_utilities/tcp_dump_packets.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/tools/tcp_utilities/tcp_mem_stats.c b/tools/tcp_utilities/tcp_mem_stats.c
index f13334ed2..4de7bc46c 100644
--- a/tools/tcp_utilities/tcp_mem_stats.c
+++ b/tools/tcp_utilities/tcp_mem_stats.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/tools/tcp_utilities/tcp_netstat.c b/tools/tcp_utilities/tcp_netstat.c
index a048c992e..dde870951 100644
--- a/tools/tcp_utilities/tcp_netstat.c
+++ b/tools/tcp_utilities/tcp_netstat.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS+TCP V2.3.4
+ * FreeRTOS+TCP V2.4.0
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of