project-chip
diff --git a/‎.devcontainer/Dockerfile
+9-5 b/‎.devcontainer/Dockerfile
+9-5
diff --git a/‎.devcontainer/devcontainer.json
+14-8 b/‎.devcontainer/devcontainer.json
+14-8
diff --git a/‎.gemini/config.yaml
+10 b/‎.gemini/config.yaml
+10
diff --git a/‎.github/.wordlist.txt
+26 b/‎.github/.wordlist.txt
+26
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
+13-6 b/‎.github/PULL_REQUEST_TEMPLATE.md
+13-6
diff --git a/‎.github/dependabot.yml
+1 b/‎.github/dependabot.yml
+1
diff --git a/‎.github/labeler.yml
-9 b/‎.github/labeler.yml
-9
diff --git a/‎.github/workflows/bloat_check.yaml
+1-1 b/‎.github/workflows/bloat_check.yaml
+1-1
@@ -40,7 +40,11 @@ RUN apt-get update \
     icecc \
     && :
 
-RUN groupadd -g $USER_GID $USERNAME \
+RUN (getent passwd $USER_UID && userdel -f $(getent passwd $USER_UID | cut -d: -f1) || true) \
+    && (getent group $USER_GID && groupdel -f $(getent group $USER_GID | cut -d: -f1) || true) \
+    && (getent passwd $USERNAME && userdel -f $USERNAME || true) \
+    && (getent group $USERNAME && groupdel -f $USERNAME || true) \
+    && groupadd -g $USER_GID $USERNAME \
     && useradd --no-log-init -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
     && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
     && chmod 0440 /etc/sudoers.d/$USERNAME \
@@ -50,24 +54,24 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
     && chmod +x /usr/local/bin/restyle-path \
     && :
 
-RUN mkdir -p /opt/sdk/sdks/ \
+RUN mkdir -p /opt/android/sdk \
     && chown -R $USERNAME:$USERNAME \
-    /opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
+    /opt/android/sdk `# NXP uses a patch_sdk script to change SDK files` \
     $ANDROID_HOME \
     $IDF_TOOLS_PATH \
     && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
     && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
     && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
     && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
     && chmod -R +x \
-    $ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
+    $ANDROID_HOME/cmdline-tools/10.0/bin `# sdkmanager for accepting licenses`\
     && chmod -R +w \
     $IDF_TOOLS_PATH \
     && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
     && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
     && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
     && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
-    # Safe directory is preffered over chown.
+    # Safe directory is preferred over chown.
     && git config --global --add safe.directory "*" \
     && :
 
 
@@ -1,20 +1,26 @@
 {
     "name": "CHIP Ubuntu Development Environment",
     "runArgs": [
-        "--cap-add=SYS_PTRACE",
-        "--security-opt",
-        "seccomp=unconfined",
         "--network=host",
-        "--privileged",
-        "-v",
-        "/dev/bus/usb:/dev/bus/usb:ro",
         "--device-cgroup-rule=a 189:* rmw",
         "--add-host=host.docker.internal:host-gateway"
     ],
+    "privileged": true,
+    "capAdd": ["SYS_PTRACE"],
+    "securityOpt": ["seccomp=unconfined"],
     "mounts": [
-        "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
+        {
+            "source": "/var/run/docker.sock",
+            "target": "/var/run/docker.sock",
+            "type": "bind"
+        },
+        {
+            "source": "/dev/bus/usb",
+            "target": "/dev/bus/usb",
+            "type": "bind"
+        }
     ],
-    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
+    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 97",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "containerEnv": {
 
@@ -0,0 +1,10 @@
+have_fun: false
+code_review:
+  # Disabled until we have clarity/guidance at a CSA level
+  disable: true
+  comment_severity_threshold: MEDIUM
+  max_review_comments: -1
+  pull_request_opened:
+    help: false
+    summary: false
+    code_review: true
@@ -41,11 +41,15 @@ AFL
 AIDL
 algs
 alloc
+allocator
+allocators
+Ambrose
 Ameba
 amebad
 amebaiot
 AmebaZ
 amebaz2
+ANC
 announcementReason
 AnnounceOTAProvider
 AnnounceOTAProviderRequest
@@ -82,6 +86,7 @@ ASR
 AssertionError
 AST
 ASYNC
+ATL
 ATLs
 atomics
 att
@@ -111,6 +116,7 @@ avahi
 avL
 AwaitNextAction
 AXXXF
+Axxxx
 AYNJV
 babaf
 backend
@@ -317,6 +323,7 @@ cryptographic
 CSA
 csg
 csrrequest
+cstdint
 csu
 csv
 ctl
@@ -326,6 +333,7 @@ CurrentHue
 CurrentLevel
 CurrentSaturation
 customAcl
+customizable
 customizations
 cvfJ
 cxx
@@ -440,6 +448,7 @@ DNSStubListener
 docbuild
 Dockerfile
 Dockerfiles
+docstrings
 Don'ts
 DoorLock
 DoorState
@@ -502,6 +511,7 @@ entrypoint
 enum
 Enums
 env
+EP
 epochKey
 epochStartTime
 eq
@@ -533,6 +543,7 @@ ExtendedPAN
 ExtensionEntry
 extern
 extpanid
+Exx
 FabricId
 fabricIdx
 fabricIndex
@@ -565,6 +576,8 @@ FlowMeasurement
 FluorideConcentrationMeasurement
 focusable
 forkpty
+formatter
+formatters
 FOTA
 FreeRTOS
 FreeRTOSConfig
@@ -578,6 +591,7 @@ fuzzer
 fuzzers
 fuzztest
 FW
+Fxx
 gbl
 gcloud
 GDB
@@ -677,6 +691,7 @@ ICMP
 IDF
 IDL
 IDLs
+IDM
 idt
 idx
 ifconfig
@@ -731,6 +746,7 @@ IPython
 ISCAN
 isHexString
 isLowerCase
+isort
 isUpperCase
 itemName
 iterable
@@ -878,6 +894,7 @@ MediaPlayback
 MediaTek
 MEI
 mem
+memcpy
 memdf
 MemMonitoring
 menuconfig
@@ -933,6 +950,7 @@ mv
 MX
 mydir
 MyPASSWORD
+mypy
 MySSID
 NAMESERVER
 NAMESPACE
@@ -1043,6 +1061,7 @@ otatesting
 otaURL
 OTBR
 otcli
+OU
 outform
 outgoingCommands
 overridable
@@ -1154,6 +1173,7 @@ PyObject
 pypi
 PyRun
 pytest
+PYTHONPATH
 QEMU
 Qorvo
 QPG
@@ -1185,6 +1205,7 @@ rebase
 recommand
 recommanded
 recurse
+refrigeratoralarm
 regen
 registerAttributeAccessOverride
 RegisterCommandHandler
@@ -1224,6 +1245,7 @@ RPi's
 RPis
 RSA
 rsn
+Rsp
 RSSI
 RST
 rsync
@@ -1330,6 +1352,7 @@ SRP
 SRV
 SSBL
 SSID
+SSL
 startoffset
 StartScan
 startsWith
@@ -1442,6 +1465,7 @@ toJson
 tokenization
 tokenized
 tokenizer
+toml
 toolchain
 toolchains
 topologies
@@ -1496,6 +1520,7 @@ unfocus
 Unicast
 UniFlash
 UnitLocalization
+unittest
 unpair
 unprovisioned
 Unsecure
@@ -1610,6 +1635,7 @@ xFFFF
 xfffff
 xFFFFFFEFFFFFFFFF
 XMLPICSValidator
+XMLs
 xtensa
 xvzf
 xwayland
 
@@ -1,12 +1,19 @@
-> !!!!!!!!!! Please delete the instructions below and replace with PR description
+
+#### Testing
+
+> !!!!!!!!!! Please delete the instructions below and replace with PR
+> description above.
 >
-> If you have an issue number, please use a syntax of
-> `Fixes #12345` and a brief change description
+> If you have an issue number, please use a syntax of `Fixes #12345` and a brief
+> change description
 >
-> If you do not have an issue number, please have a good description of
-> the problem and the fix. Help the reviewer understand what to expect.
+> If you do not have an issue number, please have a good description of the
+> problem and the fix. Help the reviewer understand what to expect.
+>
+> Complete/append to the `### Testing` section above, to describe how testing
+> was done. See
+> <https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
 >
 > Make sure you delete these instructions (to prove you have read them).
 >
 > !!!!!!!!!! Instructions end
-
 
@@ -38,6 +38,7 @@ updates:
       - dependency-name: "third_party/java_deps/repo"
       - dependency-name: "third_party/jlink/repo"
       - dependency-name: "third_party/jsoncpp/repo"
+      - dependency-name: "third_party/libdatachannel/repo"
       - dependency-name: "third_party/libwebsockets/repo"
       - dependency-name: "third_party/lwip/repo"
       - dependency-name: "third_party/mbed-mcu-boot/repo"
 
@@ -119,15 +119,6 @@ test driver:
       - src/test_driver/*
       - src/test_driver/**/*
 
-# Cert tests touched: add current milestone delta-tracking label.
-# TODO: Change after Aug 15, 2024
-matter-1.4-te2-script-change:
-  - changed-files:
-    - any-glob-to-any-file:
-      - src/python_testing/*
-      - src/python_testing/**/*
-      - src/app/tests/suites/certification/*
-
 ############################################################
 #  Source Code
 ############################################################
 
@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:90
+            image: ghcr.io/project-chip/chip-build:119
 
         steps:
             - name: Checkout