diff --git a/FreeRTOS/Source b/FreeRTOS/Source
index ae3a498e43..cdd3678c29 160000
--- a/FreeRTOS/Source
+++ b/FreeRTOS/Source
@@ -1 +1 @@
-Subproject commit ae3a498e435cecdb25b889f2740ea99027dd0cb1
+Subproject commit cdd3678c29b5064db24d34042acc974c57a0babb
diff --git a/FreeRTOS/Test/CMock/queue/generic/queue_create_dynamic_utest.c b/FreeRTOS/Test/CMock/queue/generic/queue_create_dynamic_utest.c
index d7ab3ab9be..c6af5d9b99 100644
--- a/FreeRTOS/Test/CMock/queue/generic/queue_create_dynamic_utest.c
+++ b/FreeRTOS/Test/CMock/queue/generic/queue_create_dynamic_utest.c
@@ -154,6 +154,9 @@ void test_macro_xQueueCreate_oneItem_zeroLength( void )
 
     TEST_ASSERT_EQUAL( QUEUE_T_SIZE, getLastMallocSize() );
 
+    /* Verify that Queue Length is one */
+    TEST_ASSERT_EQUAL( 1, uxQueueGetQueueLength( xQueue ) );
+
     /* Verify that Queue ItemSize is zero */
     TEST_ASSERT_EQUAL( 0, uxQueueGetQueueItemSize( xQueue ) );
 
@@ -180,6 +183,9 @@ void test_macro_xQueueCreate_oneItem_oneLength( void )
 
     TEST_ASSERT_EQUAL( QUEUE_T_SIZE + 1, getLastMallocSize() );
 
+    /* Verify that Queue Length is one */
+    TEST_ASSERT_EQUAL( 1, uxQueueGetQueueLength( xQueue ) );
+
     /* Verify that Queue ItemSize is one */
     TEST_ASSERT_EQUAL( 1, uxQueueGetQueueItemSize( xQueue ) );
 
@@ -228,6 +234,9 @@ void test_macro_xQueueCreate_oneItem_multiLength( void )
 
         TEST_ASSERT_EQUAL( QUEUE_T_SIZE + i, getLastMallocSize() );
 
+        /* Verify that Queue Length is one */
+        TEST_ASSERT_EQUAL( 1, uxQueueGetQueueLength( xQueue ) );
+
         /* Verify that Queue ItemSize is equal to the mailbox size */
         TEST_ASSERT_EQUAL( i, uxQueueGetQueueItemSize( xQueue ) );
 
diff --git a/FreeRTOS/Test/CMock/queue/generic/queue_create_static_utest.c b/FreeRTOS/Test/CMock/queue/generic/queue_create_static_utest.c
index 9664689a44..3011194af0 100644
--- a/FreeRTOS/Test/CMock/queue/generic/queue_create_static_utest.c
+++ b/FreeRTOS/Test/CMock/queue/generic/queue_create_static_utest.c
@@ -138,6 +138,9 @@ void test_macro_xQueueCreateStatic_nullQueueStorage_oneItem_zeroLength( void )
     /* validate returned queue handle */
     TEST_ASSERT_NOT_EQUAL( NULL, xQueue );
 
+    /* Verify that Queue Length is one */
+    TEST_ASSERT_EQUAL( 1, uxQueueGetQueueLength( xQueue ) );
+
     /* Verify that Queue ItemSize is zero */
     TEST_ASSERT_EQUAL( 0, uxQueueGetQueueItemSize( xQueue ) );
 
@@ -208,6 +211,9 @@ void test_macro_xQueueCreateStatic_large( void )
     StaticQueue_t queueBuffer;
     QueueHandle_t xQueue = xQueueCreateStatic( MAX_QUEUE_ITEMS, sizeof( uint32_t ), ( void * ) queueStorage, &queueBuffer );
 
+    /* Verify that Queue Length is equal to the MAX_QUEUE_ITEMS */
+    TEST_ASSERT_EQUAL( MAX_QUEUE_ITEMS, uxQueueGetQueueLength( xQueue ) );
+
     /* Verify that Queue ItemSize is 4 */
     TEST_ASSERT_EQUAL( 4, uxQueueGetQueueItemSize( xQueue ) );
 
diff --git a/manifest.yml b/manifest.yml
index 1e61881024..4848dcacc7 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -4,7 +4,7 @@ description: "This is the standard distribution of FreeRTOS."
 
 dependencies:
   - name: "FreeRTOS-Kernel"
-    version: "ae3a498e4"
+    version: "cdd3678c2"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git"