diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
new file mode 100644
index 00000000000000..82a991c721d5f9
--- /dev/null
+++ b/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
@@ -0,0 +1,107 @@
+
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "[TC-TBRM-2.2] Initial Dataset configuration of Thread Border Router"
+
+PICS:
+    - TBRM.S
+
+config:
+    nodeId: 0x12344321
+    cluster: Thread Border Router Management
+    endpoint: 1
+    PIXIT.TBRM.THREAD_ACTIVE_DATASET:
+        type: octet_string
+        defaultValue: "hex:0e080000000000010000000300001235060004001fffe002082ad51c02fe8f64f20708fddb8af85255f93a051083e2b9b2cc609b00125adbf823ea2ab20102c4d904100a133626c411d7de02a570ca3c3d80470c0402a0f7f8031054687265616441637469766554657374"
+        ## DATASET VALUE:
+        # Active Timestamp: 1
+        # Channel: 18
+        # Channel Mask: 0x07fff800
+        # Ext PAN ID: 2ad51c02fe8f64f2
+        # Mesh Local Prefix: fddb:8af8:5255:f93a::/64
+        # Network Key: 83e2b9b2cc609b00125adbf823ea2ab2
+        # Network Name: ThreadActiveTest
+        # PAN ID: 0xc4d9
+        # PSKc: 0a133626c411d7de02a570ca3c3d8047
+        # Security Policy: 672 onrc 0
+    
+
+tests:
+# pre-requisis ??
+#    - label: "Wait for the commissioned device to be retrieved"
+#      cluster: DelayCommands
+#      command: WaitForCommissionee
+#      arguments:
+#          values:
+#              - name: nodeId
+#                value: nodeId
+
+    - label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: ActiveDatasetTimestamp
+      response:
+        value: null
+        constraints:
+          type: int64u
+
+    - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: PendingDatasetTimestamp
+      response:
+        value: null
+        constraints:
+          type: int64u
+
+    - label: "TH sends an invalid ActiveDatasetRequest command to the DUT"
+      command: SetActiveDatasetRequest
+      arguments: 
+        values : 
+            - name: "ActiveDataset"
+              value: PIXIT.TBRM.THREAD_INVALID_DATASET
+      response:
+          error: INVALID_COMMAND
+
+    - label: "TH sends a valid ActiveDatasetRequest command to the DUT"
+      command: SetActiveDatasetRequest
+      arguments: 
+        values : 
+            - name: "ActiveDataset"
+              value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
+      response:
+          constraints:
+            contains: [0x00]
+
+    - label: "TH reads the InterfaceEnabled attribute from the DUT"
+      command: readAttribute
+      attribute: InterfaceEnabled
+      response:
+          constraints:
+              type: boolean
+              hasValue: true
+
+    - label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: ActiveDatasetTimestamp
+      response:
+          constraints:
+              type: int64u
+
+    - label: "TH sends a valid GetActiveDatasetRequest command to the DUT"
+      command: GetActiveDatasetRequest
+      response:
+        constraints:
+          type: octet_string
+          hasValue: true
+          value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
new file mode 100644
index 00000000000000..f4c64c57084029
--- /dev/null
+++ b/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
@@ -0,0 +1,107 @@
+
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "[TC-TBRM-2.3] Change dataset configuration of Thread Border Router"
+
+PICS:
+    - TBRM.S
+
+config:
+    nodeId: 0x12344321
+    cluster: Thread Border Router Management
+    endpoint: 1
+    PIXIT.TBRM.THREAD_PENDING_DATASET:
+        type: octet_string
+        defaultValue: "hex:0e08000000000001000035060004001fffe002082ad51c02fe8f64f20708fddb8af85255f93a051083e2b9b2cc609b00125adbf823ea2ab20102c4d904100a133626c411d7de02a570ca3c3d80470c0402a0f7f8030d54687265616450656e64696e6734040000dd36000300000c33080000000000010000"
+    ## DATASET VALUE:
+    # Active Timestamp: 1
+    # Channel: 12
+    # Channel Mask: 0x07fff800
+    # Delay: 60000
+    # Ext PAN ID: 2ad51c02fe8f64f2
+    # Mesh Local Prefix: fddb:8af8:5255:f93a::/64
+    # Network Key: 83e2b9b2cc609b00125adbf823ea2ab2
+    # Network Name: ThreadPending
+    # PAN ID: 0xc4d9
+    # PSKc: 0a133626c411d7de02a570ca3c3d8047
+    # Security Policy: 672 onrc 0
+    ## The name of the Thread Network anb channel MUST change before 1 min (limited duration to reduce the test time)
+
+tests:
+# pre-requisis ??
+#    - label: "Wait for the commissioned device to be retrieved"
+#      cluster: DelayCommands
+#      command: WaitForCommissionee
+#      arguments:
+#          values:
+#              - name: nodeId
+#                value: nodeId
+
+    - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: PendingDatasetTimestamp
+      response:
+      ## TODO : do we need to check if the value is null :
+      # value: null
+        saveAs: initialPendingTimestamp
+        constraints:
+          type: int64u
+          hasValue: true
+
+    - label: "TH sends a SetPendingDatasetRequest command to the DUT"
+      command: SetPendingDatasetRequest
+      arguments: 
+           values : 
+            - name: "PendingDataset"
+              value: PIXIT.TBRM.THREAD_PENDING_DATASET
+      response:
+          constraints:
+            contains: [0x00]
+
+    - label: "TH sends a GetPendingDatasetRequest command to the DUT"
+      command: GetPendingDatasetRequest
+      response:
+        constraints:
+          type: octet_string
+          hasValue: true
+          value: PIXIT.TBRM.THREAD_PENDING_DATASET
+
+    - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: PendingDatasetTimestamp
+      response:
+          constraints:
+              type: int16u
+              hasValue: true
+              exclude: [initialPendingTimestamp]
+
+    - label: "TH subscribes to the ActiveDatasetTimestamp attribute from the DUT"
+      command: subscribeAttribute
+      attribute: ActiveDatasetTimestamp
+      minInterval: 1
+      maxInterval: 70
+      # We wait up to 70 seconds (60 sec of delay timer defined in the PIXIT.TBRM.THREAD_PENDING_DATASET + 10 sec of margin)
+      response:
+          constraints:
+              type: boolean
+              hasValue: true
+
+    - label: "TH reads the InterfaceEnabled attribute from the DUT"
+      command: readAttribute
+      attribute: InterfaceEnabled
+      response:
+          constraints:
+              type: boolean
+              hasValue: true
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
new file mode 100644
index 00000000000000..f63477a80ab180
--- /dev/null
+++ b/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
@@ -0,0 +1,60 @@
+
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "[TC-TBRM-2.4]  FAILSAFE_REQUIRED message Validation for SetActiveDatasetRequest"
+
+PICS:
+    - TBRM.S
+
+config:
+    nodeId: 0x12344321
+    cluster: Thread Border Router Management
+    endpoint: 1
+    PIXIT.TBRM.THREAD_ACTIVE_DATASET:
+        type: octet_string
+        defaultValue: "hex:0e080000000000010000000300001235060004001fffe002082ad51c02fe8f64f20708fddb8af85255f93a051083e2b9b2cc609b00125adbf823ea2ab20102c4d904100a133626c411d7de02a570ca3c3d80470c0402a0f7f8031054687265616441637469766554657374"
+    ## DATASET VALUE:
+    # Active Timestamp: 1
+    # Channel: 18
+    # Channel Mask: 0x07fff800
+    # Ext PAN ID: 2ad51c02fe8f64f2
+    # Mesh Local Prefix: fddb:8af8:5255:f93a::/64
+    # Network Key: 83e2b9b2cc609b00125adbf823ea2ab2
+    # Network Name: ThreadActiveTest
+    # PAN ID: 0xc4d9
+    # PSKc: 0a133626c411d7de02a570ca3c3d8047
+    # Security Policy: 672 onrc 0
+
+test:
+# pre-requisis ??
+#    - label: "Wait for the commissioned device to be retrieved"
+#      cluster: DelayCommands
+#      command: WaitForCommissionee
+#      arguments:
+#          values:
+#              - name: nodeId
+#                value: nodeId
+
+    - label: "TH sends an SetActiveDatasetRequest command to the DUT with ActiveDataset field set to PIXIT.TBRM.THREAD_ACTIVE_DATASET and Breadcrumb field set to 1"
+      PICS: TBRM.S.C03.Rsp
+      command: SetActiveDatasetRequest
+      arguments: 
+        values : 
+            - name: "ActiveDataset"
+              value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
+            - name: "Breadcrumb"
+              value: 1
+      response:
+          error: FAILSAFE_REQUIRED
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.5.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.5.yaml
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/third_party/libwebsockets/repo b/third_party/libwebsockets/repo
index c57c239368deb9..457a186f5b0c3c 160000
--- a/third_party/libwebsockets/repo
+++ b/third_party/libwebsockets/repo
@@ -1 +1 @@
-Subproject commit c57c239368deb998420e663160a1ab2ffd5d7934
+Subproject commit 457a186f5b0c3cfd2898e4606c6668fffdd4235f