Merge branch 'master' into esp32/add_thread_br_ota

Author: Jerry-ESP

.devcontainer/devcontainer.json

@@ -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": {

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,19 @@
+
+#### Testing
+
 > !!!!!!!!!! Please delete the instructions below and replace with PR
-> description
+> description above.
 >
 > 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.
 >
-> Complete/append to the `### Testing` section below, to describe how testing
+> 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
-
-#### Testing