diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Cert.der
new file mode 100644
index 00000000000000..a43cc825c2b3ec
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Cert.pem
new file mode 100644
index 00000000000000..14b71a19fd136e
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIYH3c+1TajF0wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDAxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwMDBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABHs526o5PtcVX047MVXP2FH11oDGOyzi7z1bgZPylj5dB5B9b7ZS8bTlBtvC
+fzC+fPKd76KVNvZlpt5WLdWaxmujYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBTurhT+D61U14TsvgYCAiz3z0vc/zAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiAA7sH4xgoX
+LVcnAZiYx7zQ3qEsdtN4b4jHCTuX5tmYlQIhAOIOmSx+4Blc4ZGurTFvQHFEIzP/
+g/wu/O47V9kjlS5m
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Key.der
new file mode 100644
index 00000000000000..d8c3a08ec8267f
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Key.pem
new file mode 100644
index 00000000000000..71bf890d2a9979
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8000-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEINXWo2UUNrFMo69f0P8GFhXO64qFDHshtZTskDEbTbgVoAoGCCqGSM49
+AwEHoUQDQgAEeznbqjk+1xVfTjsxVc/YUfXWgMY7LOLvPVuBk/KWPl0HkH1vtlLx
+tOUG28J/ML588p3vopU29mWm3lYt1ZrGaw==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Cert.der
new file mode 100644
index 00000000000000..9bed04d4689954
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Cert.pem
new file mode 100644
index 00000000000000..a15701135f5a65
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIbPzkXaprC7MwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDExFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABE+Ago1axSKpSAQNLq/3hrzqdmYaar5sdPaqgEkHEKe/2WvsqRhfxBYPKlUR
+mzyOU+CnZm7xK8Vc9y9EtrB8NEWjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSNWJ4tTe2yQpV/nc5cOg35C3UdzTAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiB3XF1Y8D25
+oqLNq0faTyEVyI/cwbUYBm+hEalOhHfIpQIhAMju2IFzOOBRWV8jOQjb8Y10a9AU
+2jSnA3T/vfkMHsJb
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Key.der
new file mode 100644
index 00000000000000..a9c98d22d5b1f1
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Key.pem
new file mode 100644
index 00000000000000..c2bce72e25c448
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8001-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJNlTYuS2RJJUWqz1zgM9jPCyH4M36lFmr6KTW4XqonEoAoGCCqGSM49
+AwEHoUQDQgAET4CCjVrFIqlIBA0ur/eGvOp2Zhpqvmx09qqASQcQp7/Za+ypGF/E
+Fg8qVRGbPI5T4KdmbvErxVz3L0S2sHw0RQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Cert.der
new file mode 100644
index 00000000000000..5fc33f73f3f3a6
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Cert.pem
new file mode 100644
index 00000000000000..45059c1bf4cf52
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIN/d+h0m2q5cwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDIxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwMjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABOZsr6/pJjCcS4wQrDrh1dSwVXyQrRFd7WwGCBrsMCEwTf+i6G2sa1oci4+6
+U7bvXRCMOOyS+fnz0k2xt7COt9yjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBTNMLRcN/mu8A+ltudxVTeEw6TEYzAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiEAkUxb3Q2u
+1m4QhALrb6rKFDyNwrpMLrRQnn1pJXQqmf4CIGKVW0IVUxXr8YORT1CNFMkxh1CX
+pvZ2HGBdiqxu2a6q
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Key.der
new file mode 100644
index 00000000000000..6bf7eb0dcd33e7
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Key.pem
new file mode 100644
index 00000000000000..a1baaeb950d14c
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8002-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIE7uNLKpdpalSE+0+8rzXbV5vCJKWYz1yjchQ16M9HNXoAoGCCqGSM49
+AwEHoUQDQgAE5myvr+kmMJxLjBCsOuHV1LBVfJCtEV3tbAYIGuwwITBN/6Lobaxr
+WhyLj7pTtu9dEIw47JL5+fPSTbG3sI633A==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Cert.der
new file mode 100644
index 00000000000000..a219735a67aa98
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Cert.pem
new file mode 100644
index 00000000000000..ca2ac5af9e481b
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIYufDUjFUYbcwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDMxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwMzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABH/hZGE81NCU0/FQ6eelIVe1oYlw2vJhNKW+zYqMpeSiu5y6mWml6U9LNfua
+Fon8kOCkTz2vqQdgLhNw64jUyuGjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQs/6C9iO9RZ/3MLviUB/Ql/X6T7DAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiAIgyJ6qlJ5
+CD62/bOTu490C17MjKNx60M2HtYkfBUxfQIhANSgn40lpvKg98ymreetuiI25apU
+EexG8uqlUUuS1W0s
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Key.der
new file mode 100644
index 00000000000000..788c0214b97a7c
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Key.pem
new file mode 100644
index 00000000000000..7a29e0ff94d0c0
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8003-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFw+v0Rei1J/+BRXChkTnEh9STsLcxrFFAp4i5S3Q1NgoAoGCCqGSM49
+AwEHoUQDQgAEf+FkYTzU0JTT8VDp56UhV7WhiXDa8mE0pb7Nioyl5KK7nLqZaaXp
+T0s1+5oWifyQ4KRPPa+pB2AuE3DriNTK4Q==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Cert.der
new file mode 100644
index 00000000000000..91abcc8cbb55df
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Cert.pem
new file mode 100644
index 00000000000000..9ca9cae9244912
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIIZRFnMlMrwnQwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDQxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwNDBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABPhE7loHfCebggwW9w6oRR8frM7LihRFOqv/vR9BGeXekXAxjY6qEAJbRNpb
+yE6JrLxvuTGhR1BmW0iIH4Lw1jSjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBS8sHoeyy7LbsmCTj3GVLkYUSJ2BjAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNJADBGAiEAoGHzyQTx
+PeBoKbb9NvCd/HRjoWNHPiYLy7ko9RgsGTYCIQDmwRjmsC97Xn0ZK+8ZlAqGeTbA
+q37kghErUnR1lLsFvQ==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Key.der
new file mode 100644
index 00000000000000..7fd7f043dfec07
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Key.pem
new file mode 100644
index 00000000000000..c7d7e44304fd6e
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8004-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEICj1JzM+m7o8ziXvyD0D3+tRyOi8/Jz29YacxQqhJvDzoAoGCCqGSM49
+AwEHoUQDQgAE+ETuWgd8J5uCDBb3DqhFHx+szsuKFEU6q/+9H0EZ5d6RcDGNjqoQ
+AltE2lvITomsvG+5MaFHUGZbSIgfgvDWNA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Cert.der
new file mode 100644
index 00000000000000..672e54c8d017c4
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Cert.pem
new file mode 100644
index 00000000000000..518ae669f6362c
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIc6IdDlQzcTowCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDUxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwNTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABLXUwCYGUIZtdvsOVHKnqZ92xKy25A0x7D6mRTUuX+hBSTRpvjZatuwunktY
+/jl3vhB7wKOykzcwoSTZEfgZzi6jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSStlAZeAQkTJo5kdELRAHDyah/sDAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNHADBEAiBdu5+BTG/b
+uqwpHI+FbpfjsgjKGkfoumU5mLw8UXaV9QIgTzDUtRDMS2IXwGfhYLq6WqhvEvfP
+aF0zq+NvYxpJGzo=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Key.der
new file mode 100644
index 00000000000000..45a300907e8b34
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Key.pem
new file mode 100644
index 00000000000000..408c628540c6d9
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8005-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEINJUdytpEJDdMRdJC4iCaEsgZXJjEIC1zXDRNrtNKqMToAoGCCqGSM49
+AwEHoUQDQgAEtdTAJgZQhm12+w5Ucqepn3bErLbkDTHsPqZFNS5f6EFJNGm+Nlq2
+7C6eS1j+OXe+EHvAo7KTNzChJNkR+BnOLg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Cert.der
new file mode 100644
index 00000000000000..813122c5180336
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Cert.pem
new file mode 100644
index 00000000000000..e3c5e97e850c93
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIBf1Vc/w49hEwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDYxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwNjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABGqBajYaq8VikEfmt++ywqRklaZ4kiBxi29Hdwf7Upjp4zFaS5zHp4tg1jjg
+KjulemyT/pSJaO8EH7l7ws6ZHlCjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSIOXnx0tcgIxVN3wgPmGlRXSiXazAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNHADBEAiAK7sayGJZH
+1bEClb7L2KSJOUQ5TSwTYj1qxqsKKlhuPAIgXivVGbZUt6vz5xFTnSVlPzMQueIx
+KkjTgeVBl0XpcXQ=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Key.der
new file mode 100644
index 00000000000000..40b55d473f0399
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Key.pem
new file mode 100644
index 00000000000000..cb188a2dcf43d5
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8006-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIOQ1uQYJJR+87RntZ+VtA6/JFfETqHoJyBt+8uFyIOR5oAoGCCqGSM49
+AwEHoUQDQgAEaoFqNhqrxWKQR+a377LCpGSVpniSIHGLb0d3B/tSmOnjMVpLnMen
+i2DWOOAqO6V6bJP+lIlo7wQfuXvCzpkeUA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Cert.der
new file mode 100644
index 00000000000000..94a834d8469253
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Cert.pem
new file mode 100644
index 00000000000000..36e8206f0ff73e
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIHdeR6DFK3pMwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDcxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwNzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABFbAmBODWR1IFccP0jUXOPO2Lgnb7qPOXQVZ06/nq+ydvte0FCX4kCA3qdW1
+fEwnaqmIAHN+4cE1Y2YyBGlwQkijYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBTLQOYplUF3XRtXQXqvttuqO3BjkzAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiAZaguooS0C
+J2tfQt7gHrGgbftsXLRl7EzJnYgN4GgbAgIhALqHNVWcGEx3H02Ltv82SL/TUnWD
+BNZYX8MbdlFR+YY5
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Key.der
new file mode 100644
index 00000000000000..514570d4bf1353
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Key.pem
new file mode 100644
index 00000000000000..47a5ef01c7ad5a
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8007-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFPxqxDmp5dOrjEEsVxlRvE4TNNqUHjI5R5l6zgGCvShoAoGCCqGSM49
+AwEHoUQDQgAEVsCYE4NZHUgVxw/SNRc487YuCdvuo85dBVnTr+er7J2+17QUJfiQ
+IDep1bV8TCdqqYgAc37hwTVjZjIEaXBCSA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Cert.der
new file mode 100644
index 00000000000000..6109ae23fc1577
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Cert.pem
new file mode 100644
index 00000000000000..0fbcafdcaaecf9
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIAm5UfLK1pYMwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDgxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwODBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABFJ0xx5WlpGBlwTJNj6vEyFCDZlkk8wv953VTUjOGb7SZWrn+d2mcSkXkUt0
+6RahPHblVmOz2Z24ARFwVp1z7KSjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSKh/zUM5eDSsGqMONAz8y/61fqWzAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiALIVP0qcTe
+ug5I1mTow8gjT/eXZqUeEM+W2xj4wjvxswIhAIp8AL5SmQ0Rm9QH3MEBuFmHRFHQ
+MBiUCHtK+/vmojbw
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Key.der
new file mode 100644
index 00000000000000..9b040d844bc47e
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Key.pem
new file mode 100644
index 00000000000000..b83ef1be940917
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8008-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILcQR7C728ciUbrT423+XKz5D8quJuLxV3vRs8o8u7jPoAoGCCqGSM49
+AwEHoUQDQgAEUnTHHlaWkYGXBMk2Pq8TIUINmWSTzC/3ndVNSM4ZvtJlauf53aZx
+KReRS3TpFqE8duVWY7PZnbgBEXBWnXPspA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Cert.der
new file mode 100644
index 00000000000000..36f979a87ae0f8
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Cert.pem
new file mode 100644
index 00000000000000..953da3c931c59f
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIIPdhBVAMPhtQwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMDkxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwOTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABPtchQrVm8HLf5WkHKZbEVt9FnWX1GM6AjMsdpZT/+ttb3NAIaiF4dv2ETTk
+X6Pxz80w7osBMSqU8XZB0sBxuX2jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRvs6G9AqagKJL5U7sl/gZbgZXAyzAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNJADBGAiEA5XtozRdb
+GCrDlL+FN3+LoJwOnXLo0AVtLyOyJvlcNlcCIQDDvbPgyZ9SBtKbKZF94cHMB+ck
+DdcsG7JcmRL5RTDIWg==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Key.der
new file mode 100644
index 00000000000000..b6866350650464
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Key.pem
new file mode 100644
index 00000000000000..94b67ee29ae7fa
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8009-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILQ1ms5ULKyaxuNKraIJu7fmkRJg+utHQrtWMuW//i90oAoGCCqGSM49
+AwEHoUQDQgAE+1yFCtWbwct/laQcplsRW30WdZfUYzoCMyx2llP/621vc0AhqIXh
+2/YRNORfo/HPzTDuiwExKpTxdkHSwHG5fQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Cert.der
new file mode 100644
index 00000000000000..f27f908f7b7357
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Cert.pem
new file mode 100644
index 00000000000000..d6d348130cc262
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIcmWn2ER30mQwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMEExFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwQTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABBm2FvNDTBJZy2D2KQA+lhwKFA1aw91w7Ja3F8mcsGY+G7k9KLDMCO7Xmv9s
+Qnku3tuoIrrKUooGu3qpQsLc/xyjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRF3FNQziyuy8xQSlNLBCgUehXYNTAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNHADBEAiAQHRYxjPje
+4yq6yqRSRvWLNW4VtjkWoENLMc8jlxSVXwIgaXxA4fuiIsR0zyySN7ReUM/3hx5n
+OHsa/bSeTb9X6/4=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Key.der
new file mode 100644
index 00000000000000..c8bcbda30a801b
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Key.pem
new file mode 100644
index 00000000000000..2683fb4c4a1851
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800A-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFUt9791I1OIEZ+FTI8P2bWvwM+G1Irp6GpQYjyzj7DBoAoGCCqGSM49
+AwEHoUQDQgAEGbYW80NMElnLYPYpAD6WHAoUDVrD3XDslrcXyZywZj4buT0osMwI
+7tea/2xCeS7e26giuspSiga7eqlCwtz/HA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Cert.der
new file mode 100644
index 00000000000000..0b6298a75afe0d
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Cert.pem
new file mode 100644
index 00000000000000..2baf51079fc6b5
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIdXZIO8raDwowCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMEIxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwQjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABOvFEKFGPRHkRFcJuparXDXf9zDFyww3DiC7G7YuLSpkqsGR6XbaH21k6NVq
+b/EuObJFaRSbI+4wTL3rAR9EtZGjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBR6XSCQYufjQOi8o7B4EORA60EZMTAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiAKDTySl0rb
+EWuH1ggOAHK4v0Js5ivuPkgs1F2jgcWmXAIhAPSh8MkcdyTIwo84gkX5uMjT4601
+Ku6GVo/4YECDuQ9D
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Key.der
new file mode 100644
index 00000000000000..4f77019e58aae9
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Key.pem
new file mode 100644
index 00000000000000..78d7ed5b4562c6
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800B-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIPSgxBqVSxg3+HvAVyrh8P8fTINRXhPAro/zviPDEMKzoAoGCCqGSM49
+AwEHoUQDQgAE68UQoUY9EeREVwm6lqtcNd/3MMXLDDcOILsbti4tKmSqwZHpdtof
+bWTo1Wpv8S45skVpFJsj7jBMvesBH0S1kQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Cert.der
new file mode 100644
index 00000000000000..9d5eb8c8768fda
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Cert.pem
new file mode 100644
index 00000000000000..b607744c47a30a
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIKl+HKVHdJMEwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMEMxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwQzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABEo8G0KbyN/Ypp+sPHnuCZR6cWZ35e1ZEykG2xYNhO45tqdjO5bRp5nV7fMp
+IzU+08Bs8ipCnTRnb4CMgueVu4ijYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSMFc0fGrt4QJ7suz/Uf5wSuntw9jAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiEA9KJkKb2G
+m3eaITIMFus8BquyKmtcyItumEKD7asZVlICIH3gIpDW9G1umyfZ8s/cVOwlEYLy
+9e04Z1jN5tkU8XtR
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Key.der
new file mode 100644
index 00000000000000..3d519a216b947e
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Key.pem
new file mode 100644
index 00000000000000..ac84eabeb364d9
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800C-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIBA/M4Veaua+Sq12u83Db3GdH1ytJwL+JJwaY0Q0FFZ1oAoGCCqGSM49
+AwEHoUQDQgAESjwbQpvI39imn6w8ee4JlHpxZnfl7VkTKQbbFg2E7jm2p2M7ltGn
+mdXt8ykjNT7TwGzyKkKdNGdvgIyC55W7iA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Cert.der
new file mode 100644
index 00000000000000..97ad307d87df54
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Cert.pem
new file mode 100644
index 00000000000000..52202fccc4be13
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIIQ0KQ6zXfXogwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMEQxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwRDBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABBI/7s2GVQq0bAsp+jZNqYLTo3rw5foVGmUh1IEINpXceKrnb1/awJFNCkQ0
+O9btX/ztV1CUvv9Uaj1KfwUIg5KjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBS1sFbJXfdf0bTqDhmwE8Q0cvmb4jAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNJADBGAiEAn2SrnUDG
+TgLWRmXSmLNsm19m7m0JtquXZCkThq09wDoCIQDpzUC9o+gDNeWuJsCwf+pYRqmG
+ZMdRE/VjZy98IrmYvw==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Key.der
new file mode 100644
index 00000000000000..4ebab902e789d2
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Key.pem
new file mode 100644
index 00000000000000..5c44e7fab05aab
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800D-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEINVh/nPUdUKfrCxJdF84mPEcwcVOk3yiVWsAjYdpBm5zoAoGCCqGSM49
+AwEHoUQDQgAEEj/uzYZVCrRsCyn6Nk2pgtOjevDl+hUaZSHUgQg2ldx4qudvX9rA
+kU0KRDQ71u1f/O1XUJS+/1RqPUp/BQiDkg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Cert.der
new file mode 100644
index 00000000000000..e44da9cc1311e4
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Cert.pem
new file mode 100644
index 00000000000000..40783800f104b1
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIID3+Cayp/1g4wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMEUxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwRTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABGAgyjUjj9mdfUXpDGEsz4SHKz7b4qlsJSLz3EMwkMTtRHvpufAfjmgff25C
+A+zzMn5RqiHeAE/kYF9FNaWBLSCjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQ38s7klM09dlZIzoGal7PGSF8JRzAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNJADBGAiEAs3RYhRP/
+CY0C71l9D1HY79EViawFA8ISMVceHf2s6HECIQDnzokbUAtv1H3jsTNGVO3yRApY
+7AcSWwir2pLI13h87Q==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Key.der
new file mode 100644
index 00000000000000..e4c28ed2241c35
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Key.pem
new file mode 100644
index 00000000000000..8660dca317e686
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800E-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIMdsge/TPjWlQQfYaqdBc5Jgld9dbNcarus6pYk3YibSoAoGCCqGSM49
+AwEHoUQDQgAEYCDKNSOP2Z19RekMYSzPhIcrPtviqWwlIvPcQzCQxO1Ee+m58B+O
+aB9/bkID7PMyflGqId4AT+RgX0U1pYEtIA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Cert.der
new file mode 100644
index 00000000000000..2ff26e68fae43d
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Cert.pem
new file mode 100644
index 00000000000000..bc600ee4970e78
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIXrq9iFPJ2pAwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMEYxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAwRjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABGHFOX4QPDFKUlTUFR/tKNASOlMNRiCemK8t1ud33Seq/zzxlszBCRWc9d9x
+9hfhRFj1W+3B7fv9TXKMxIz7pAOjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBS+SMFNMLGGTAuXB1Tegk6ohaFbpzAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiEAmcMvHniy
+qbA+9/qdmpBNvmwAf/q1pZKLXztSNhdHkRwCIAkNuIDVZA/xO26cLod+btQ6WCaN
+IMXwUHN6s8y265nh
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Key.der
new file mode 100644
index 00000000000000..e2298489166424
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Key.pem
new file mode 100644
index 00000000000000..8572d24ead2ac4
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-800F-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIM/SCAELu/j4DvRDRBAPDYTIFnTsBsB7AgFxBmejo7uwoAoGCCqGSM49
+AwEHoUQDQgAEYcU5fhA8MUpSVNQVH+0o0BI6Uw1GIJ6Yry3W53fdJ6r/PPGWzMEJ
+FZz133H2F+FEWPVb7cHt+/1NcozEjPukAw==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Cert.der
new file mode 100644
index 00000000000000..ff95a7249b9f99
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Cert.pem
new file mode 100644
index 00000000000000..1dbdbfeb480fdd
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0DCCAXagAwIBAgIIKpj/BIB0oQYwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTAgTXZpZDpGRkYyIE1waWQ6ODAx
+MDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABBGL3oJG6+23w+7M1mk+JA4kBvZJ
+RNFUac4AV9C3qZ9Fj0sbbz3FcZ3treBiX67Cj6UONyFBScLrYVXBkprCziijYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQnXR81oxAc
+wp8HgUh2BElID+YeGDAfBgNVHSMEGDAWgBSrX6M7Of8o1zgKu1YHN4/w73uL1jAK
+BggqhkjOPQQDAgNIADBFAiAI0eIXu749saoeRRRK6MbxTwfWcO1wkybTV5ghL/UB
+BwIhAM1Td6YFjJUTv3ULRqlJEnmDi0mhPNs5zqHVS/2zjTDU
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Key.der
new file mode 100644
index 00000000000000..5436dc67fdd8a2
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Key.pem
new file mode 100644
index 00000000000000..d563037417499f
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8010-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIGDy90S9Tppq/Zmt8kSNuxzCiLjCvjPG3JBW2P2H97wRoAoGCCqGSM49
+AwEHoUQDQgAEEYvegkbr7bfD7szWaT4kDiQG9klE0VRpzgBX0Lepn0WPSxtvPcVx
+ne2t4GJfrsKPpQ43IUFJwuthVcGSmsLOKA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Cert.der
new file mode 100644
index 00000000000000..a11af7cd63f9da
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Cert.pem
new file mode 100644
index 00000000000000..6372ef829e07d9
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0DCCAXagAwIBAgIIIe9lOMB6m6EwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTEgTXZpZDpGRkYyIE1waWQ6ODAx
+MTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKaqrLqQzmMNRgX7li+XQX13b71P
+c5Y3nRDcOdEoX0Pb617sHQ3s0YWrOD0xGmdiSevKkF6mGmFHvlHfKAUF+TmjYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBS0CZQ8IeMl
+DR3qSiIYaKLIke/IPzAfBgNVHSMEGDAWgBSrX6M7Of8o1zgKu1YHN4/w73uL1jAK
+BggqhkjOPQQDAgNIADBFAiEAoHMqZ/ZTLQL9LSiCMC41Id3sBY5hsI0JYTRlsgPR
+kpoCIEasSLEmzjz+Ijl5ML1UFs1QO5r9vLy/VZqUGOVucK5i
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Key.der
new file mode 100644
index 00000000000000..70c7cf9bf3fb82
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Key.pem
new file mode 100644
index 00000000000000..a4133e6b6849ef
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8011-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIM9cjQuPg9iuatakrG6Hcwt0Mrf1VTpQS1bOY6r35TFJoAoGCCqGSM49
+AwEHoUQDQgAEpqqsupDOYw1GBfuWL5dBfXdvvU9zljedENw50ShfQ9vrXuwdDezR
+has4PTEaZ2JJ68qQXqYaYUe+Ud8oBQX5OQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Cert.der
new file mode 100644
index 00000000000000..6dec7a152f9f30
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Cert.pem
new file mode 100644
index 00000000000000..1c043a9de62a2c
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBzzCCAXagAwIBAgIITw56VcgPdQEwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTIgTXZpZDpGRkYyIE1waWQ6ODAx
+MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ6UWXfyLSZlkCH00KY0KyU+HqLc
+/blfdsMk524sYrdwtDv+DwgxgsayYNailevi9R7pCBfWb+qXpycOH7B3OnWjYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRbQFHGarD2
+ztpKfc8UNk9klyEQZjAfBgNVHSMEGDAWgBSrX6M7Of8o1zgKu1YHN4/w73uL1jAK
+BggqhkjOPQQDAgNHADBEAiBB5ic+1gKqx5t+wYHVe3RUcl277rwNaHiqpp02v8eC
+IwIgToxEOCI4oD/FlztUr1Je89yr2x2/SOMIBB8SAqM2Xvk=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Key.der
new file mode 100644
index 00000000000000..46e9d399ef05d3
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Key.pem
new file mode 100644
index 00000000000000..d3720923b9e9e4
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8012-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIEWSXDC+srQCHizCALJT49ImAaCCAOgRbjY3E4GzNdVqoAoGCCqGSM49
+AwEHoUQDQgAEnpRZd/ItJmWQIfTQpjQrJT4eotz9uV92wyTnbixit3C0O/4PCDGC
+xrJg1qKV6+L1HukIF9Zv6penJw4fsHc6dQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Cert.der
new file mode 100644
index 00000000000000..e19c73a4634949
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Cert.pem
new file mode 100644
index 00000000000000..36c2841a756cd9
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBzzCCAXagAwIBAgIIPZ+UoxcF/ykwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTMgTXZpZDpGRkYyIE1waWQ6ODAx
+MzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABMsRA7pk4OMalvi8Xt43tjPSuxLj
+W08BuTwQDgPgda1TKEQbdZOqPoA78oc8AZ3kUlEkeOYPNIrZlgBXtTbKhJKjYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRr6xG7y40W
+s4l+AELgy/+eLbYmUDAfBgNVHSMEGDAWgBSrX6M7Of8o1zgKu1YHN4/w73uL1jAK
+BggqhkjOPQQDAgNHADBEAiABOO1xEafeVdd5pbTlh0vnxXuCGhw2ZJ5v3ZmX03jE
+4gIgeF+rOzp3bNV2cRkulctuMSRNwrWKznyDgwtrhkj9kCE=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Key.der
new file mode 100644
index 00000000000000..9f9da2cfed9902
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Key.pem
new file mode 100644
index 00000000000000..34bd6c7bf83ec6
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8013-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIGQB9vp27ej8lgkGusvSGGe84faRhPvamU+lmFFawyiJoAoGCCqGSM49
+AwEHoUQDQgAEyxEDumTg4xqW+Lxe3je2M9K7EuNbTwG5PBAOA+B1rVMoRBt1k6o+
+gDvyhzwBneRSUSR45g80itmWAFe1NsqEkg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Cert.der
new file mode 100644
index 00000000000000..780ab541c13c1b
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Cert.pem
new file mode 100644
index 00000000000000..e879aded6cf298
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0DCCAXagAwIBAgIIRqhM4r8GiqAwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTQgTXZpZDpGRkYyIE1waWQ6ODAx
+NDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOJgTuyPVB2vgGLDccSMD7uRyH19
+sE8vZJoBjdRh0/PziZXdLwshV8t/tnPB09fu4lsx+eyePcIWUdwGaq0ryxKjYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRmsdsTh/nJ
+AiLYc6UHNuNG4B8HNDAfBgNVHSMEGDAWgBSrX6M7Of8o1zgKu1YHN4/w73uL1jAK
+BggqhkjOPQQDAgNIADBFAiEAySoTuHZFAJgz0ldsdL1BOYWHXIW9PbytLGYCoVdw
+KJMCIA+ErGI/+Kqe2jsCt0NctlJZ3HRmV3HiAY42a6xyTBUt
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Key.der
new file mode 100644
index 00000000000000..21d97f082b664c
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Key.pem
new file mode 100644
index 00000000000000..f4c2737d0c8bb9
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8014-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJyXtiMDYrYhrQapIV8QHQdalepaus3Y9fMZEEUthk7ZoAoGCCqGSM49
+AwEHoUQDQgAE4mBO7I9UHa+AYsNxxIwPu5HIfX2wTy9kmgGN1GHT8/OJld0vCyFX
+y3+2c8HT1+7iWzH57J49whZR3AZqrSvLEg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Cert.der
new file mode 100644
index 00000000000000..49627ebd805243
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Cert.pem
new file mode 100644
index 00000000000000..a925900b63bd7b
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIIGvpT0aJ8XrUwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTUxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxNTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABIrT9S31lLiHw/vMDnadu1FZAGb+42p2098+X7He6iI6DZzHSbicZjjpMH5i
+DWYkKN7SjaELDEreKE78MP5O6SCjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBTFFxvgKIanODLEWNURKbbf+d5uOjAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNJADBGAiEA3gu5qVBI
+g+hnQL+z6rJ9g3lOJRQAGv2OUqetTRza0MICIQCMWDORZ5tZ6anmW0+31Q4/y10e
+pTve6krFRyPiAy+8JQ==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Key.der
new file mode 100644
index 00000000000000..3efa3af8e4159b
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Key.pem
new file mode 100644
index 00000000000000..977c9ecc49c041
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8015-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEICWBMqcyF2tAcHV5QN+1pgH/sNcwJ8Xy3udSYubhBGl3oAoGCCqGSM49
+AwEHoUQDQgAEitP1LfWUuIfD+8wOdp27UVkAZv7janbT3z5fsd7qIjoNnMdJuJxm
+OOkwfmINZiQo3tKNoQsMSt4oTvww/k7pIA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Cert.der
new file mode 100644
index 00000000000000..32d6e29562fc31
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Cert.pem
new file mode 100644
index 00000000000000..6f60b0152319dd
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIHBGXvD1ZpxIwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTYxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxNjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABDqiL+Rp+AEfuNEclK7HzMvhkRObXbFmeESCL36bft75OzqxYTf2paXbmtJi
+15gztnNYe/8rDy7gnh91t8xECoCjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQh5uKxeUS52vs4HSuT/p2gAk/eTjAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiBrjOHe59Dp
+xiIcHVdVnJ77QA83VnVf2arSk/UY+qel0wIhAMmJpPBr/t+aJteAYpEag0n/eQtr
+4Bqms5UWnnij5RlI
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Key.der
new file mode 100644
index 00000000000000..6db1c1dc212c87
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Key.pem
new file mode 100644
index 00000000000000..2044e04ce48912
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8016-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEICncO4NnSJhf1wCdB9ZiN17IXHL/lf2+YGSBbytwOuDEoAoGCCqGSM49
+AwEHoUQDQgAEOqIv5Gn4AR+40RyUrsfMy+GRE5tdsWZ4RIIvfpt+3vk7OrFhN/al
+pdua0mLXmDO2c1h7/ysPLuCeH3W3zEQKgA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Cert.der
new file mode 100644
index 00000000000000..66bc47c1adf4a0
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Cert.pem
new file mode 100644
index 00000000000000..77923b8343a1a1
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIISwI1yr7F9QowCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTcxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxNzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABJbw62Sk8DlSDdNy6bLQyhqNEg3dPb5ASyboXelITMT0+1YhX1v1S3IjvN5k
+ysEJmjxf0B7Cr4T5XXzgxjskXkijYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBS2K26LDeNHrkrm2FJCMzgcnBGg3TAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiEA0DQ1irYt
++OK/1PtU1PgriYRS7wWNLZAOp7oQFZYTn5oCICuATvPEkMuTxewvfWWmVyy1apKR
+/ILaIwrlR6WUacIE
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Key.der
new file mode 100644
index 00000000000000..3ab921f7ce6ba0
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Key.pem
new file mode 100644
index 00000000000000..0affa0322206b4
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8017-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIAvH1As3Uhgdk4X8FwM5Vg7ZiFtFPkFAz3bjHQWgPlwhoAoGCCqGSM49
+AwEHoUQDQgAElvDrZKTwOVIN03LpstDKGo0SDd09vkBLJuhd6UhMxPT7ViFfW/VL
+ciO83mTKwQmaPF/QHsKvhPldfODGOyReSA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Cert.der
new file mode 100644
index 00000000000000..a4e61535d7c75b
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Cert.pem
new file mode 100644
index 00000000000000..1f7cd337cb9be6
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIBlzyphtG414wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTgxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxODBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABC4bT6SEMYMlSqU0xuT2QvLsgr3X5rKLtFBuyO6mtbVjalGCI8Bygjh8NNUD
+A6y7v9DsTpCE3D/2Fatk0xyQs/KjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRGqybeSgzVLXZwB60QG8XwOejY8jAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiA6RC+KiZXH
+HB9KSW0vsvR1uPWry3bTjo18QBbBhqr2mAIhAKNU3L/qLI+jlvf7cPswyQVUxKoN
+FzQYcZAoMTL/1o9P
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Key.der
new file mode 100644
index 00000000000000..06f53e47e6374b
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Key.pem
new file mode 100644
index 00000000000000..12afb97851b3c4
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8018-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILPStS2KDHytMgzvkSRLLL/+KGjdh4a9TqR0vyofeP+8oAoGCCqGSM49
+AwEHoUQDQgAELhtPpIQxgyVKpTTG5PZC8uyCvdfmsou0UG7I7qa1tWNqUYIjwHKC
+OHw01QMDrLu/0OxOkITcP/YVq2TTHJCz8g==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Cert.der
new file mode 100644
index 00000000000000..5eef42195d1d19
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Cert.pem
new file mode 100644
index 00000000000000..53eebc17220f93
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIfffsPrsPUnMwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMTkxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxOTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABFOvCczQ5g6DzImqZP/8UF9fxnttu8tCtBIEJCAg/Woh8IWhiEg3qEo5+ONa
+t7ozwXPK2F6LjVhL1YHctYpNJ9qjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRmkZbeFZ2WcT8ruOQZm4BIQCoenjAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiEAitf1ZCWD
+3G2TrK5iVllMJNSOppBCJWAe0WAHmxrzgtoCIDs+kCNUheX1Fqu3Av0OOVoxaBeC
+9bCRxxn1HB12dRvL
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Key.der
new file mode 100644
index 00000000000000..8bbd3b96034d9f
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Key.pem
new file mode 100644
index 00000000000000..ce63313f783a1d
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-8019-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIGWZHZTneAlUy/A37knKN/+9bF40pRKnrnjul07cUxDaoAoGCCqGSM49
+AwEHoUQDQgAEU68JzNDmDoPMiapk//xQX1/Ge227y0K0EgQkICD9aiHwhaGISDeo
+Sjn441q3ujPBc8rYXouNWEvVgdy1ik0n2g==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Cert.der
new file mode 100644
index 00000000000000..43dc1055ef1e68
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Cert.pem
new file mode 100644
index 00000000000000..131136f1d03070
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIRXvKiJUlvLQwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMUExFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxQTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABNezjOqXNzCMEygk+0VKZJV3Cqk7oZEo2OHqCs/TzfhlA4VJzTmN3+oYwKNK
+hddjpyz1xLpiELQARNsEv1d0LXmjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRccM8G/1Z2DoJcidjb4EuQfB/dZjAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiA9rUgTRWRQ
+QEiXcOBSfRvjh4ANge6ojlC/HsmRJTpocQIhAP0ZaJ/jPx+ZJ0G1HDDtD3yDWTaB
+SoHsNV+C1y0DpIPB
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Key.der
new file mode 100644
index 00000000000000..c9f389c270080b
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Key.pem
new file mode 100644
index 00000000000000..9edd18212d1a48
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801A-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJ9/NQYas9h4Y+K/C4V0umzMTC5PN4HOg9bm/bHWRLbOoAoGCCqGSM49
+AwEHoUQDQgAE17OM6pc3MIwTKCT7RUpklXcKqTuhkSjY4eoKz9PN+GUDhUnNOY3f
+6hjAo0qF12OnLPXEumIQtABE2wS/V3QteQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Cert.der
new file mode 100644
index 00000000000000..7953e008597fa5
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Cert.pem
new file mode 100644
index 00000000000000..9686f35d4d2407
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIZcY0n3PGp38wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMUIxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxQjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABOmTq3Ut/LL/fYjFwkTSTCfX/uEENUnC4e2If+/zca3lWHD0BIVpqc8A98Hz
+eIJ8XAXbsnlvmT82f9HADolywNujYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQxTV0yOoTKXs+Sxr6Bre6DKkbfajAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiBWLIyN1T0a
+177U1LxsyXmrLCvunFAgaT8e44bGRHD/qAIhAJs6yKXCZKRHB5JVGmBC+VBgyUjW
+tDiR0gTx8eXaU3ji
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Key.der
new file mode 100644
index 00000000000000..94617bb8743e72
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Key.pem
new file mode 100644
index 00000000000000..4cf9899b591e3f
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801B-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIMfMg2SsK4A4O91xxsYgZHeLosO3UuFBbi+6YGLFMGavoAoGCCqGSM49
+AwEHoUQDQgAE6ZOrdS38sv99iMXCRNJMJ9f+4QQ1ScLh7Yh/7/NxreVYcPQEhWmp
+zwD3wfN4gnxcBduyeW+ZPzZ/0cAOiXLA2w==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Cert.der
new file mode 100644
index 00000000000000..7d8f6477b1fbc8
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Cert.pem
new file mode 100644
index 00000000000000..aba6056fe178f4
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIITDs8/OZgpeMwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMUMxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxQzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABIyBUnxLCclHvVp2x0u+uhqSrwixXof4xQBBl39RD3AFS8VivUg00/LT0Equ
+T+i5IzPLxMqcOpVx1wDH3FyKbCOjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRGLF1Ii6RoJM1HaLqCdwCrygZwGzAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNJADBGAiEArF7sDhi7
+57mdHCRhpblreyRuFb/WkeCtr6A7N0UfWIkCIQCyoy+7acsasGeeflGbnllwYcY0
+LXLJzcnD9Im71u9ndw==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Key.der
new file mode 100644
index 00000000000000..287b6235deb4b6
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Key.pem
new file mode 100644
index 00000000000000..df2b1697c5cf21
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801C-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILhaajcCUsVX5mKcivLypOo7vEiMaMG8jXMTf2+1zTyboAoGCCqGSM49
+AwEHoUQDQgAEjIFSfEsJyUe9WnbHS766GpKvCLFeh/jFAEGXf1EPcAVLxWK9SDTT
+8tPQSq5P6LkjM8vEypw6lXHXAMfcXIpsIw==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Cert.der
new file mode 100644
index 00000000000000..7045d13949c010
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Cert.pem
new file mode 100644
index 00000000000000..66d8da5a0991a1
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIaxHFqZfgk3UwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMUQxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxRDBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABNjhI15uN+LeEPx5J/aVcUvt0jsfuY06ZG3YT88REms1waRC58/YcbGUDyUo
+9koMWvds8VLcyGglFOuyCk9JJQCjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBTzYdefzpmi4URYNHB7+swBEA2HwTAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNIADBFAiEAtDBzSQPu
+j/SLxX8nrhwMhvce2CmOMMjx08Vo4dI0dR4CIEBJDeTonaHt4uxUKWfrvT22kDIx
+W1TC4sNwXIerC11f
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Key.der
new file mode 100644
index 00000000000000..de9a5ebd09df58
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Key.pem
new file mode 100644
index 00000000000000..a5900f6b960294
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801D-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIfFZVV9qjPEFthT2+EUZqQBWowcetX9dJz0EjOBwIUkoAoGCCqGSM49
+AwEHoUQDQgAE2OEjXm434t4Q/Hkn9pVxS+3SOx+5jTpkbdhPzxESazXBpELnz9hx
+sZQPJSj2Sgxa92zxUtzIaCUU67IKT0klAA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Cert.der
new file mode 100644
index 00000000000000..20dfe46894f4ae
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Cert.pem
new file mode 100644
index 00000000000000..8d104d42179938
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIVSG3KvW5IogwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMUUxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxRTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABMqm9nT6KxlG2XIUGHMIdotj9yjMkZfim94OG8jXpbLZkLluK3PxnwXD5gYR
+UHilo0TgYRLxQ0S9wxix++zVLMajYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQTINckFOQ5IeXLbtevZtACc3bYeTAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNHADBEAiA2k5sq3h6Y
+KD3KtGyr/bf6vIGWF7VtDzWqHoOd+mludAIgbsE5nR5UIQwYNUfgEA3FtMl7k4pI
+yarwMTak/JyqUF8=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Key.der
new file mode 100644
index 00000000000000..52e136f28e45ca
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Key.pem
new file mode 100644
index 00000000000000..e24109cb2120de
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801E-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFbvitFCY9wLZ46WkK13CRgbpkFVVxMvbaX1sX+oK7cRoAoGCCqGSM49
+AwEHoUQDQgAEyqb2dPorGUbZchQYcwh2i2P3KMyRl+Kb3g4byNelstmQuW4rc/Gf
+BcPmBhFQeKWjROBhEvFDRL3DGLH77NUsxg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Cert.der
new file mode 100644
index 00000000000000..ce97c2f2e37630
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Cert.pem
new file mode 100644
index 00000000000000..757982190d8aa5
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIZh+iwJJDlOgwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYyIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMi8weDgwMUYxFDASBgorBgEEAYKifAIBDARG
+RkYyMRQwEgYKKwYBBAGConwCAgwEODAxRjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABAopafiB9wGYWCeApDlICeTxPTh+aBMx6hcRGW+qgJPpheGDZ0WXp+roqaIn
+7tJ7cBzwSXrzi4ATKVlmk21HhlGjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSnIicnkNgmgooEyfzcOndmYiNJQjAfBgNVHSMEGDAW
+gBSrX6M7Of8o1zgKu1YHN4/w73uL1jAKBggqhkjOPQQDAgNHADBEAiAEzluhkP7B
+aR9EYzVExHl3cQkfI0s8/q9Z3ojAIHM25QIgLRxfxx/u8DcoNrdiZAv6eizjMHGd
+Vb1su73uu/kleIU=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Key.der
new file mode 100644
index 00000000000000..cc1e93fd803f17
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Key.pem
new file mode 100644
index 00000000000000..1f04f74b2102bf
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF2-801F-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIAHTi26cY+IPkUZGJU5Ys6OP6qfyHnFNsKPaZueyYh3woAoGCCqGSM49
+AwEHoUQDQgAECilp+IH3AZhYJ4CkOUgJ5PE9OH5oEzHqFxEZb6qAk+mF4YNnRZen
+6uipoifu0ntwHPBJevOLgBMpWWaTbUeGUQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Cert.der
new file mode 100644
index 00000000000000..9fecc2a9cfba11
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Cert.pem
new file mode 100644
index 00000000000000..f0fd228641bd48
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIISaVKfvys89QwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDAxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwMDBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABIXvO97HWSu/0MjRcT6VnzpRSDzPVhP+QIUii5/7/zOSfrSgwLeCXJ/WJVaL
+umkgx16Ts2SGd7Ibild00WmUs8qjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSMBJrOwWCJZ8SjKKGqXtLlZPYQ/TAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiAQFbW+NkuA
+Px6dL2RhAOu8PRNTnGZK6trJvQ0j7u5B9gIhAK3KsSDtQUi4BkFBYrTVQrsu0JdA
+Uk3f8/3v5Z1qeyZh
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Key.der
new file mode 100644
index 00000000000000..86fb5f1040d562
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Key.pem
new file mode 100644
index 00000000000000..9823d6ba9da9b1
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8000-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIAqS31fCu90pLkMNTX3536rVzFeP3lqj89s98wFlvzVroAoGCCqGSM49
+AwEHoUQDQgAEhe873sdZK7/QyNFxPpWfOlFIPM9WE/5AhSKLn/v/M5J+tKDAt4Jc
+n9YlVou6aSDHXpOzZIZ3shuKV3TRaZSzyg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Cert.der
new file mode 100644
index 00000000000000..042849922c6683
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Cert.pem
new file mode 100644
index 00000000000000..6418a96446face
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIKPYMyXQSK28wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDExFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABJd3YzefiKmkmbr99TGtSxvN/9EAhsACKdrcvdvxQlofosBcnSI1nn17+F2r
+1POxfX3bGM3meRicInB9Dj20mfijYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRVTynD5XttIMRUfpMFgrMjC7580TAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiB6nfz1pyYw
+C5YQCSg/bZWIm1BN/rZ+cvTSdrd2zBSuRQIhAIfJ5X2VAyEdj6xBsLg6me6c2k/q
+Hl/E3eWvOnzW88y2
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Key.der
new file mode 100644
index 00000000000000..a60c14d75c9fe6
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Key.pem
new file mode 100644
index 00000000000000..4e98723bac6b13
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8001-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIDRbjdfQdaTHs8tzKYpDeBZL9hXcgb+RcAt/3kDdpGUEoAoGCCqGSM49
+AwEHoUQDQgAEl3djN5+IqaSZuv31Ma1LG83/0QCGwAIp2ty92/FCWh+iwFydIjWe
+fXv4XavU87F9fdsYzeZ5GJwicH0OPbSZ+A==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Cert.der
new file mode 100644
index 00000000000000..bf6226ecc9a998
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Cert.pem
new file mode 100644
index 00000000000000..34ff52c8ecf52f
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIZ+4mkf9NOWkwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDIxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwMjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABPcFPfGqhx4ZBRFttTaImb36gFptqBYge8w0Dn3PfPVChjRK80Cac45Xb8XA
+zfOAgeCdODF39FPnzuRYvkTmb1KjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRMs7OA5NHJQBAmZpYmgK1ktqqLNDAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNHADBEAiAQBQMdqdKH
+9Yc2Q58IPJn+AmQjB8qTIkk2vNN+lw1tTAIgBabN/kQiFea7rDnXc4o/BxRPKrt9
+TFhVCuHQ2HX15UM=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Key.der
new file mode 100644
index 00000000000000..9091e45c1bec07
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Key.pem
new file mode 100644
index 00000000000000..88b89b6558ca7c
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8002-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFfh9cLWIC7TD11k0peckjGVU2kXq7D39WYSakd7N2CCoAoGCCqGSM49
+AwEHoUQDQgAE9wU98aqHHhkFEW21NoiZvfqAWm2oFiB7zDQOfc989UKGNErzQJpz
+jldvxcDN84CB4J04MXf0U+fO5Fi+ROZvUg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Cert.der
new file mode 100644
index 00000000000000..860666e7797df3
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Cert.pem
new file mode 100644
index 00000000000000..7d550578b2e8a2
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIIKNaQV+vMhuUwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDMxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwMzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABA3Fm+oKnEwJHA/rVB+9PfeIlZHFPMYWGl0da06zpDmRo39WwS3rd/6Bcctw
+twR1ZxcgbzlaipJdkWIWch1tB5SjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBS8H1gMlDwnGYQkD1x0lE7GXabVzDAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNJADBGAiEAlhI6TCdk
+fw9aOkNWLF4LML7/uVJDdZFfkHagc5UzaGcCIQCdbA7B/IQHJ6/Ydv6+8lhpuLJR
+J/1eypSl09Hl0rN+ow==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Key.der
new file mode 100644
index 00000000000000..07353af4cc2632
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Key.pem
new file mode 100644
index 00000000000000..da19ff6aaff0ed
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8003-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJKyNhXZjHyxDIchxTK8oGC/XgWV/dynhQLp4Xw1UemIoAoGCCqGSM49
+AwEHoUQDQgAEDcWb6gqcTAkcD+tUH70994iVkcU8xhYaXR1rTrOkOZGjf1bBLet3
+/oFxy3C3BHVnFyBvOVqKkl2RYhZyHW0HlA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Cert.der
new file mode 100644
index 00000000000000..a92ca1c0f85939
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Cert.pem
new file mode 100644
index 00000000000000..69c88d39cd756f
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIIe3wa3/FkNRAwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDQxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwNDBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABNfj/jxLVMnXvbBfJNNwd7Sv75g0Ca01BlPpaPUTE3EMLbwXdnSVfibC0ASs
+GJhY5Cj1kkxd2hjQocU4jJct5hqjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBTo6kACpmcsVTIWQAVQe91SVSk6YDAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNJADBGAiEAlF4PXqGY
+beEUWISGGS31qgPKEvZofPvr13GtELcVf1ACIQDmBx3nFlf3D5GZ1v5cZ3++SSp0
+By0OeivqkTZegEmVVQ==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Key.der
new file mode 100644
index 00000000000000..52f73d0add98ef
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Key.pem
new file mode 100644
index 00000000000000..676cb7bb390193
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8004-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIBUllNP9VzmIehmAy8u2d4QEo4kBFyi308zpgAvEV3d8oAoGCCqGSM49
+AwEHoUQDQgAE1+P+PEtUyde9sF8k03B3tK/vmDQJrTUGU+lo9RMTcQwtvBd2dJV+
+JsLQBKwYmFjkKPWSTF3aGNChxTiMly3mGg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Cert.der
new file mode 100644
index 00000000000000..6a030d62d22bbf
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Cert.pem
new file mode 100644
index 00000000000000..eb1cf74da36b33
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIINXcEcPoVuEowCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDUxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwNTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABJ07iiJrd9DInXEpozQz22tXzRoe3K6ZAegsorrCfp/8fErKqCOEHysuhmMH
+xm0pGfeZTmP8+OqOQ0/h4U4fQFyjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQXSxGZujKF58B+veVt1tvdtct6FzAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiEAuSefqPdY
+OWeCksW78rDUszw5XZXpeOBwlkp1ou28J3sCIFSJ89Boo8kZ8qBkMXEmg4b2vtyg
+vLwc2wduhrLpkaEN
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Key.der
new file mode 100644
index 00000000000000..8e32d85baab942
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Key.pem
new file mode 100644
index 00000000000000..eaa60677f8dd76
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8005-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILp3ik4QfSHet+Bh7jalKU8KdAzXg3vuESo8DkrX1lLaoAoGCCqGSM49
+AwEHoUQDQgAEnTuKImt30MidcSmjNDPba1fNGh7crpkB6CyiusJ+n/x8SsqoI4Qf
+Ky6GYwfGbSkZ95lOY/z46o5DT+HhTh9AXA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Cert.der
new file mode 100644
index 00000000000000..bfb50f1aa352ce
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Cert.pem
new file mode 100644
index 00000000000000..ec4bfe56ea5002
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIWzeoE1kptoswCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDYxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwNjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABOPdMnDDVrxbJEV10OwRTzS5U7p1bLlVFvo5BJCJIwQ5A5DW3sRm3axRtFzm
+tbgF+BocpmBDRX6H1eiGsnTPTEOjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQe1z0zg+f3brdCWmaldNt0R/RdkTAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNHADBEAiA/RLoTkyvU
+gWAZwH/wxucCP0Z7qhSPExJdZGnFaXqolgIgN8Xru5GviVzeP31/MdGptIXB2ga0
+doBk+dg/Q0WDxS0=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Key.der
new file mode 100644
index 00000000000000..d48f92b001ddc8
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Key.pem
new file mode 100644
index 00000000000000..f2e712b2dc1177
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8006-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIOC4DvQQ+g3QbbzFGID59q/5+gNj9RGI34oeL+b9R10koAoGCCqGSM49
+AwEHoUQDQgAE490ycMNWvFskRXXQ7BFPNLlTunVsuVUW+jkEkIkjBDkDkNbexGbd
+rFG0XOa1uAX4GhymYENFfofV6IaydM9MQw==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Cert.der
new file mode 100644
index 00000000000000..83f0c305c28012
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Cert.pem
new file mode 100644
index 00000000000000..c313d338dd5875
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIKWIlvw3PMEcwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDcxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwNzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABLf/KzahCv6TF1Gjx7vrHWx70w9/3rfAzBBxZ5pQEqcdNxmf6zrq+m+vO3C4
+8RJrRtLPI+VLFf8PWuwM+N8RLN6jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQJAPpwk127OVzJyBjL83tm1mO6ezAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiAwVFHIIF/i
+AYQUeH/Ko/TWivjgCMBDqmy5cWSZpsuaigIhAISxcO33xswDDH4becgTQ7aAci96
+ZM8itW8nSWqS78aJ
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Key.der
new file mode 100644
index 00000000000000..b513db3f878c71
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Key.pem
new file mode 100644
index 00000000000000..1e6a3aeb210846
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8007-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIB3z8nQUKrHiAUHtA7VIeraghTyLvtFPqWaHuH42G6ogoAoGCCqGSM49
+AwEHoUQDQgAEt/8rNqEK/pMXUaPHu+sdbHvTD3/et8DMEHFnmlASpx03GZ/rOur6
+b687cLjxEmtG0s8j5UsV/w9a7Az43xEs3g==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Cert.der
new file mode 100644
index 00000000000000..972a8996e824aa
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Cert.pem
new file mode 100644
index 00000000000000..e8cb906ee7fdc4
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIQV6rNq7FnQ0wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDgxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwODBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABMIo0C9kehspM0btBshDOafVDQeTUI1ZgjwSOqMozlLcwaTMHXj+aca62okO
+nACjGE2/s5q4Y9PwIlhFWcOFDu+jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRlJ8ES9EJbMMwLncglmy4OsgVzhjAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiB8SC0x2mr1
+GiS8os8Pkg1Pe1Dols1gS3emPGuAO4pA7QIhAIkTIYuIUXoJWRfz15bxdNq38UIy
+3oqFCLJcIeXWfFup
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Key.der
new file mode 100644
index 00000000000000..e80a92c84368fa
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Key.pem
new file mode 100644
index 00000000000000..1392b3ac08631a
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8008-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIK6dyYhPKC88spxo0VpLZhkhnmRVA30y3EGfyn0cj/3xoAoGCCqGSM49
+AwEHoUQDQgAEwijQL2R6GykzRu0GyEM5p9UNB5NQjVmCPBI6oyjOUtzBpMwdeP5p
+xrraiQ6cAKMYTb+zmrhj0/AiWEVZw4UO7w==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Cert.der
new file mode 100644
index 00000000000000..99a7d75f22ac1b
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Cert.pem
new file mode 100644
index 00000000000000..3e3dceb4ff7448
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIJ9OXSVmhuxUwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMDkxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwOTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABAAASV3AO6eoNu7kiKRwhMAv0dUZ92nQWkTvKi4M0XidWFo34B5MGV8My8ol
+aKhOkF7B/tThkp8VY9JQy96U6sWjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQsG0+35HdYcW4v3IIlfff6dGR5/jAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiA/qCu7GV+a
+c45KBNBQBwH8GFdL4Gij+9lpHHl2N2imRAIhAJ0DcfUw8LV0eGOVwQeS0+Derwez
+IdPxl8rkONjK+cVg
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Key.der
new file mode 100644
index 00000000000000..b7b4e6ba0f2a03
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Key.pem
new file mode 100644
index 00000000000000..45ed43ad703125
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8009-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHyLYLUzNMeZ9tTXgqH42ejO+R7cBoZkv1FMX1g/omVWoAoGCCqGSM49
+AwEHoUQDQgAEAABJXcA7p6g27uSIpHCEwC/R1Rn3adBaRO8qLgzReJ1YWjfgHkwZ
+XwzLyiVoqE6QXsH+1OGSnxVj0lDL3pTqxQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Cert.der
new file mode 100644
index 00000000000000..ed90b540c7269c
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Cert.pem
new file mode 100644
index 00000000000000..a88da6d70c6dac
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIJ0sR4pZN7BYwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMEExFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwQTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABMh7D3tzt5U/acq0xN41gaX/tJSya5HS0egRM7capAcNhybl4LVuLyDCVfv9
+wldIoNKKP3towEXNnNA9Ifa/NcajYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQyiwBhmTr6XNqf9yn/G2rhWdtF/zAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNHADBEAiBbC5Am+7wp
++YMrxhp8RIjDSDudLMsLmaMvQCoaAywdbQIgV07Ttsy7P2qm/aGRoiJzTfXbq4WB
++qOjBXZmpzJ/YTk=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Key.der
new file mode 100644
index 00000000000000..757dfc00e80f75
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Key.pem
new file mode 100644
index 00000000000000..0acc3bf84779c9
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800A-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHLtlG1f7acsDm1SR111G7S8wBrgCQINpyzUizKKXIWOoAoGCCqGSM49
+AwEHoUQDQgAEyHsPe3O3lT9pyrTE3jWBpf+0lLJrkdLR6BEztxqkBw2HJuXgtW4v
+IMJV+/3CV0ig0oo/e2jARc2c0D0h9r81xg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Cert.der
new file mode 100644
index 00000000000000..476d200fdb31ed
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Cert.pem
new file mode 100644
index 00000000000000..317e40b2d9725f
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIEZKpJjE1mb4wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMEIxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwQjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABC1PkDhC5hAoOa6nABUxhnp9P9Bz3UxzzRDzr1JI4jKwKIKlsRc9LF/8UklH
+fWHt//1mZylEvAJah3lEZ3EBaB2jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRulFzuUUNak/Tkv/4aPKs/PU/96jAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiALjIG9uK+z
+uglXWgKYRXfFikg1IEKc/adT0/G6sIREpwIhAKC665xXl9IXNeQf2gULMN2qP9eh
+gufzR+iro8/0ZpuE
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Key.der
new file mode 100644
index 00000000000000..aa51b3812380e9
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Key.pem
new file mode 100644
index 00000000000000..08fa8499cd91bb
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800B-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEID7Enz4zSa/E//aaVYrbTkvZ2XLRLurpAxjEgkUq1sGboAoGCCqGSM49
+AwEHoUQDQgAELU+QOELmECg5rqcAFTGGen0/0HPdTHPNEPOvUkjiMrAogqWxFz0s
+X/xSSUd9Ye3//WZnKUS8AlqHeURncQFoHQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Cert.der
new file mode 100644
index 00000000000000..6e23cfcb0af2f9
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Cert.pem
new file mode 100644
index 00000000000000..edc25b4410c47c
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIUb350tWRT0AwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMEMxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwQzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABFa2yaskj3fogbmzyqW88cpQL+QB5mYUAzZqJf3oNohrP4Ag0KIsbEiur32s
+cu8/9VnLYXna+juyVx+EddPa5SejYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRDbNuwBo7bprCoittMulbbhb8wQzAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiEA9434d91u
+RaUCAMYUN3mM3drN0q2n27ADLJaFrkOnR/cCIDST/nDFgbaX2TiJXGGtf/aMOoKk
+348A+WQ8RCvyXe7Q
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Key.der
new file mode 100644
index 00000000000000..dc5e8c925c2000
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Key.pem
new file mode 100644
index 00000000000000..7181d1da1ede1d
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800C-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIENS5ZwGKX4MN+bONFnLmSXeFJ880eeix9iE0N8yVxKBoAoGCCqGSM49
+AwEHoUQDQgAEVrbJqySPd+iBubPKpbzxylAv5AHmZhQDNmol/eg2iGs/gCDQoixs
+SK6vfaxy7z/1Wcthedr6O7JXH4R109rlJw==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Cert.der
new file mode 100644
index 00000000000000..ce84b425649df6
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Cert.pem
new file mode 100644
index 00000000000000..d1a71f1ae3caf1
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIEccaMUIiDbYwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMEQxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwRDBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABKMJF8OHcAJahkqYHAp4K5GflcxRNPg/MCs2Ov4hYXwD1DCUMqyk3l53E11q
+6EIT1Rw/kvX6gQ3a4BnljQ41lnyjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSjLPF5mjHXcJMgjcE7it/FFy/CDTAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiAlhsPCc9y8
+BTd82xOcZfm/BavlDrIDebTujZlY9DUu2AIhALGrwVWdhc1XFS+b7IGQtfpz4atv
+kbIxmA2tMrPhVjrY
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Key.der
new file mode 100644
index 00000000000000..0f9e414146c526
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Key.pem
new file mode 100644
index 00000000000000..d6c2da9a7be44c
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800D-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIEDW7Mudhks18sAGQomLrBIY7vBij92ucWMUMYwFde12oAoGCCqGSM49
+AwEHoUQDQgAEowkXw4dwAlqGSpgcCngrkZ+VzFE0+D8wKzY6/iFhfAPUMJQyrKTe
+XncTXWroQhPVHD+S9fqBDdrgGeWNDjWWfA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Cert.der
new file mode 100644
index 00000000000000..b964605bf9aae5
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Cert.pem
new file mode 100644
index 00000000000000..901c0e25b15e3c
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIIKGcHA4zmbGIwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMEUxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwRTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABEaVI5nXTtGMtNMKj4F5BwGgtgh/LkFZZE8QXCZ0CmnKN5Z+uI973rF/il+6
+L0BLrerGuqtNMmHaUihXymXYsAqjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQ3sGBp2o+Oo1JwngjOrmU2EiQayjAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNJADBGAiEA1JZ9dsxm
+JYyuYJSNtYmH8Qf0gF5YHMy5F/HbDUX/nmMCIQCctbyjanN9CDgAvwKQTtX6V87z
+dlxHRuAd+ytA8hgtMg==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Key.der
new file mode 100644
index 00000000000000..4ddd4084571fb6
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Key.pem
new file mode 100644
index 00000000000000..ea4a3a1061e8eb
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800E-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFZaF4C/UQqGfpzOs8opEyTw3n5MCo0jvlSSeHiZaz1KoAoGCCqGSM49
+AwEHoUQDQgAERpUjmddO0Yy00wqPgXkHAaC2CH8uQVlkTxBcJnQKaco3ln64j3ve
+sX+KX7ovQEut6sa6q00yYdpSKFfKZdiwCg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Cert.der
new file mode 100644
index 00000000000000..056349a0b96130
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Cert.pem
new file mode 100644
index 00000000000000..0450380571f05e
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIKaxkRAkNB/cwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMEYxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAwRjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABNl5mfSvizRAeU4RPj56d1lsWGxaGi8kbCzw/X3hzRS8+UcBsIL5Xwm0Xk3z
+bDuRaLpxl5eHkUhlo2m9OY3QGV2jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQvwvk53NgpWwZHjdzp4p94mBa2kzAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNHADBEAiAOB8l9YjFK
+pywl9tOfzeqC0ps+PWUphWeU0vzAYjgPyAIgKZh/W9hYrqm6emWnKAFxEGCqkR8n
+K3dBmmbRnrcyDoI=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Key.der
new file mode 100644
index 00000000000000..3743d87ea5f754
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Key.pem
new file mode 100644
index 00000000000000..f018678c11f661
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-800F-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIMoMk/hYbQzv3OLdEZPC+3OMtpngXzq2Jef4S3KeqPAyoAoGCCqGSM49
+AwEHoUQDQgAE2XmZ9K+LNEB5ThE+Pnp3WWxYbFoaLyRsLPD9feHNFLz5RwGwgvlf
+CbReTfNsO5FounGXl4eRSGWjab05jdAZXQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Cert.der
new file mode 100644
index 00000000000000..026cc57298d5b2
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Cert.pem
new file mode 100644
index 00000000000000..07fc8bcf9b33e7
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0DCCAXagAwIBAgIILVnGsiyZdu4wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTAgTXZpZDpGRkYzIE1waWQ6ODAx
+MDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGmZgAV24fTFQW45CSz3YFwz0ytz
+YSs7ekmfS4gNFmF9FnJEDHqvxNEdC3TSmTcDHYanpPFWO/VW/9/DucbXgdWjYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQLYZcNVzth
+YAolFCvIf7bXTjEybzAfBgNVHSMEGDAWgBQ0l0LmFX9/0BScVTK2m34siOSnazAK
+BggqhkjOPQQDAgNIADBFAiEA9f1l5GH4ZtByMq4LvQnjRuiLNhClP18lPIh3RbHs
+W58CIGQIY629X9hZXKbfkuLOTsAbiRf/zoviRXJfk67c9hpq
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Key.der
new file mode 100644
index 00000000000000..12cb823ef1c51a
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Key.pem
new file mode 100644
index 00000000000000..39aea7993c6d10
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8010-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFg29C6qhwqZjbv/E/qKtUmnqMqsTkxOnT8NEh/xekOgoAoGCCqGSM49
+AwEHoUQDQgAEaZmABXbh9MVBbjkJLPdgXDPTK3NhKzt6SZ9LiA0WYX0WckQMeq/E
+0R0LdNKZNwMdhqek8VY79Vb/38O5xteB1Q==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Cert.der
new file mode 100644
index 00000000000000..62b47a35e9758f
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Cert.pem
new file mode 100644
index 00000000000000..15071553e8cfda
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0DCCAXagAwIBAgIIKUQdxo8IhewwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTEgTXZpZDpGRkYzIE1waWQ6ODAx
+MTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOEJLPr60pdf4oZMKdcX8gYW+3z7
+g884H/pvgEBBGfwIO3ywwk55MzCQK4ToGk+3QNXhWa29SzRNXyrk8EzVl26jYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQdKbPboRsI
+HnaRDGRDgWbKQebSVDAfBgNVHSMEGDAWgBQ0l0LmFX9/0BScVTK2m34siOSnazAK
+BggqhkjOPQQDAgNIADBFAiEA9glyZo35+0UCIyGLdjWUtgLnDWcYXYBeiKgeZm1t
+dj0CIASGZVc7ERL7wyYyh7z02WEtFb4/+uQCb4acj+uHjA1X
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Key.der
new file mode 100644
index 00000000000000..dc1fe2292e517a
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Key.pem
new file mode 100644
index 00000000000000..856c81dd36ba81
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8011-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIAwgbDSiQegndIxBth5F7g7V13Vdu2oownJyfb/WXkAcoAoGCCqGSM49
+AwEHoUQDQgAE4Qks+vrSl1/ihkwp1xfyBhb7fPuDzzgf+m+AQEEZ/Ag7fLDCTnkz
+MJArhOgaT7dA1eFZrb1LNE1fKuTwTNWXbg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Cert.der
new file mode 100644
index 00000000000000..60794d9c874da2
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Cert.pem
new file mode 100644
index 00000000000000..cd745108c2ecd8
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0DCCAXagAwIBAgIIaNDBLiBZ724wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTIgTXZpZDpGRkYzIE1waWQ6ODAx
+MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIlu+Kx8elMTT68KCib0YRGhuqrp
+bjy7TMKJeFXO4leg8sGtAbBffHiNWoPf91JBM9eMcQ5joj0V9kWvdayDTjijYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTemF3N/M78
+mvLnYAosu79nUJHD7zAfBgNVHSMEGDAWgBQ0l0LmFX9/0BScVTK2m34siOSnazAK
+BggqhkjOPQQDAgNIADBFAiBvB5tgbTcqQ5KZ7mLvFtOhsjliTdXC1i4xB8Y0Xvmx
+ZgIhAOWLVwfwHFVOowLwUSd9n/h2qFEsKN40AsVF8jiitikA
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Key.der
new file mode 100644
index 00000000000000..48615aba2f8a57
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Key.pem
new file mode 100644
index 00000000000000..6f72dacd0df502
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8012-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHa6whS5+stkMfNxqTPAZk6VXPZyi+Cn5yAvMxLT0iFqoAoGCCqGSM49
+AwEHoUQDQgAEiW74rHx6UxNPrwoKJvRhEaG6quluPLtMwol4Vc7iV6Dywa0BsF98
+eI1ag9/3UkEz14xxDmOiPRX2Ra91rINOOA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Cert.der
new file mode 100644
index 00000000000000..85aed97b2e8bdd
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Cert.pem
new file mode 100644
index 00000000000000..680ab2b8b28274
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0TCCAXagAwIBAgIIWPzwGcSGQ0cwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTMgTXZpZDpGRkYzIE1waWQ6ODAx
+MzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJueR0qNkGbbifn22sTjqivKn0oL
+oWwFazoOPBK7gRRoDsc0SHOw7GGIhI18qI9N2a3rqwqBXNsBoK4SV7aKtyyjYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRHwGBxU8gn
+lUAYe5mO/GxGzBVFujAfBgNVHSMEGDAWgBQ0l0LmFX9/0BScVTK2m34siOSnazAK
+BggqhkjOPQQDAgNJADBGAiEAvu9F4o2KJDhAQlXaQegZ0fCBTVIFTG6bULke8bPb
+GEICIQCB747FsDyIHokyyWxSrOsGSacZlfEgLUKoTLBc6TQDww==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Key.der
new file mode 100644
index 00000000000000..cb14a8bbac9fe8
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Key.pem
new file mode 100644
index 00000000000000..9f51e1979c12be
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8013-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHsEu4YgaMGhV3L9k0/8b93ihwtkYpNA9d526TrbdBpqoAoGCCqGSM49
+AwEHoUQDQgAEm55HSo2QZtuJ+fbaxOOqK8qfSguhbAVrOg48EruBFGgOxzRIc7Ds
+YYiEjXyoj03ZreurCoFc2wGgrhJXtoq3LA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Cert.der
new file mode 100644
index 00000000000000..1a527c02b87543
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Cert.pem
new file mode 100644
index 00000000000000..7626437ea58fbb
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBzzCCAXagAwIBAgIIS/UYYCVLMtEwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsxOTA3BgNVBAMM
+ME1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTQgTXZpZDpGRkYzIE1waWQ6ODAx
+NDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABM1v39/VYeFP0oND20WEOgCvB/Ou
+qb/BM/aKFKOeABMETNzIO5ycmLgTbuogptllNGD0lcV0GGi89hk3ZdHG7h6jYDBe
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSlhdo+cmsT
+vibOk6i0PjjvGZ3UPDAfBgNVHSMEGDAWgBQ0l0LmFX9/0BScVTK2m34siOSnazAK
+BggqhkjOPQQDAgNHADBEAiAtKJfbHy3SCpSSPg9Y6taasBaUjGwiMWVEsjGgV1ZC
+EQIgMFEtItkCPiBuBdvRBbrziW+harDw9EjHnQhmmbLXX/Q=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Key.der
new file mode 100644
index 00000000000000..930a4e29f8fd0e
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Key.pem
new file mode 100644
index 00000000000000..26a987d65775cc
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8014-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIPKNHwfkkb9y6njqSMQ6X+VPlwFs7GpRytqkTyPuoK1coAoGCCqGSM49
+AwEHoUQDQgAEzW/f39Vh4U/Sg0PbRYQ6AK8H866pv8Ez9ooUo54AEwRM3Mg7nJyY
+uBNu6iCm2WU0YPSVxXQYaLz2GTdl0cbuHg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Cert.der
new file mode 100644
index 00000000000000..e120c97724cbd2
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Cert.pem
new file mode 100644
index 00000000000000..ba4b25a5e86ee4
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIQRCisf7KzTUwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTUxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxNTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABAfbio3/b4vkdgFQSxezJ4OO4ZlgkjKW8uuVagPOdFk+rUXMV4iHJAigHqnJ
+4uJsTC1BUka4vknN7L3afAb5ezGjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQt/TMsjcNnv7rKpsbu9bHx/ruzXTAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiB9D5jegPpS
+WiMp6uJlqF+bnIwFFxZ2nwzxwrjYpj1UKgIhAOheZDo4xO+a2uMDpLbm6B3SoqhO
+b8HtECt0YXZQIVJ7
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Key.der
new file mode 100644
index 00000000000000..9658cd03239ec1
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Key.pem
new file mode 100644
index 00000000000000..e3500b0b083d8f
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8015-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIL+yH2pl0B4pGCtwHR0i6utouQ9o3YGLhc4vt/THp8e2oAoGCCqGSM49
+AwEHoUQDQgAEB9uKjf9vi+R2AVBLF7Mng47hmWCSMpby65VqA850WT6tRcxXiIck
+CKAeqcni4mxMLUFSRri+Sc3svdp8Bvl7MQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Cert.der
new file mode 100644
index 00000000000000..41b937df931cd2
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Cert.pem
new file mode 100644
index 00000000000000..a254f744bcc6f8
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY6gAwIBAgIIXnVGttysnzQwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTYxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxNjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABDpUwNjYqTu2RQKj80Pe2KpsLd4udMhgBfD3damWuvzpqgikYi+CAOL+fVrQ
+hA6LcIYfk+YaGAsJ/aH1ev9ZaqmjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRhnOE/dktyrElyUNBm5+d96BEPszAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNHADBEAiAacxwoTk9E
+WbOBpY8j2UocdMG671XykTQZSu/+v7/+6QIgYXyE9htIE83LNI3BNKMIzd2T0SZf
+D8CFR+9LyAxaTzI=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Key.der
new file mode 100644
index 00000000000000..610800297da987
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Key.pem
new file mode 100644
index 00000000000000..20f7c067e79a57
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8016-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIOZ3Xrpgaywg9hE1hqi0R+IUQXtSavSov1dxPUaEfXD+oAoGCCqGSM49
+AwEHoUQDQgAEOlTA2NipO7ZFAqPzQ97Yqmwt3i50yGAF8Pd1qZa6/OmqCKRiL4IA
+4v59WtCEDotwhh+T5hoYCwn9ofV6/1lqqQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Cert.der
new file mode 100644
index 00000000000000..754fe46fdc2b80
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Cert.pem
new file mode 100644
index 00000000000000..733128ebeebbfb
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIZS57DssMcXgwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTcxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxNzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABI7fnhPTP8PV5SRuzRhjJh1Fr0yJ6MtKw203si48j2ZIXXjh9fNoF+vkX6tQ
+/z9uOKiiPCzAUx0ArMfIJqawM5KjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQVkEVrE6F0qsvL0BwLuoF3WJwlqjAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiEAz8tID5bm
+sKxXJ+UlZwsszUcYhkXp223HkTpqNDg7HcQCICeH7pmGIoKyJpRN04O1arVQ7L8M
+KiLPiX1Wdk+QJwVt
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Key.der
new file mode 100644
index 00000000000000..5d882662e24b90
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Key.pem
new file mode 100644
index 00000000000000..74247d4217ce9d
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8017-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEII0bR0EA7gbUO3y6lywmS/ie1vbF8VPlqwWJDYW5wdjIoAoGCCqGSM49
+AwEHoUQDQgAEjt+eE9M/w9XlJG7NGGMmHUWvTInoy0rDbTeyLjyPZkhdeOH182gX
+6+Rfq1D/P244qKI8LMBTHQCsx8gmprAzkg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Cert.der
new file mode 100644
index 00000000000000..deec5c2ad94c10
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Cert.pem
new file mode 100644
index 00000000000000..8623002a7ac734
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIINuc34ow80qAwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTgxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxODBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABPEq7co9hGBudCSORK54chlAmNpuv72jMXSQZmyOkQ+46qFNxDia5eami5vp
+RqZS17MJ65ZjAtWOgzVJML4HXOSjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRlD8vj+bwVrVO5wBRd1kBXlnLoQTAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiEAj9QSB1xx
+uD+TUf4MiBMVDq0Z2+mEe3YzVA+EY5vgo9kCIFlFbgT5+kowjEpF3weG2MEsl+0L
+8jLc3kQK2Htks4bK
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Key.der
new file mode 100644
index 00000000000000..38e0d0ee3cef22
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Key.pem
new file mode 100644
index 00000000000000..422dba18d81327
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8018-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIGvudT3f5OyVeUD37wpaJn+o43NE3YOWSqZUMkkQpYALoAoGCCqGSM49
+AwEHoUQDQgAE8Srtyj2EYG50JI5ErnhyGUCY2m6/vaMxdJBmbI6RD7jqoU3EOJrl
+5qaLm+lGplLXswnrlmMC1Y6DNUkwvgdc5A==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Cert.der
new file mode 100644
index 00000000000000..6d24f2bc33646b
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Cert.pem
new file mode 100644
index 00000000000000..31d97b330980c1
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIIIwL1D5JdY2owCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMTkxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxOTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABE0PWMLyf1iVcSkjiGD0ZoF5sN8I3eD3AMyMGGid4HaTP9Dif06lnjkKmuqP
+TUsQAh1V3/QF1cDMfc2xduP390ejYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQYmK2gTLVnwv7iqoCBFoFkewShVjAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNJADBGAiEA7EQYjKlD
+ylPY+JdhH1SmDnZKFdX7hNM9UFSnHv2rKbwCIQDQO07MfLWaT1LBpaKUBj7vzsiE
+elru6zOEAnoBUi0yZQ==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Key.der
new file mode 100644
index 00000000000000..1ccca0544a254a
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Key.pem
new file mode 100644
index 00000000000000..161e72e9070fca
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-8019-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIOnJIHZSvk5JlblQ8wCHEjufnuxBll0A32lJGVbL5bBJoAoGCCqGSM49
+AwEHoUQDQgAETQ9YwvJ/WJVxKSOIYPRmgXmw3wjd4PcAzIwYaJ3gdpM/0OJ/TqWe
+OQqa6o9NSxACHVXf9AXVwMx9zbF24/f3Rw==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Cert.der
new file mode 100644
index 00000000000000..060ea596c38eb5
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Cert.pem
new file mode 100644
index 00000000000000..b876a332ed1281
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIUnn0p47UYuowCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMUExFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxQTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABA2NCcpJm5xojGULI9v894dIupxS3Ztgpvwk7UFGpsXxNdOquQXAkO4TBiPO
+oT/1JyYMQAUOyuVZcS3k/IeRVrCjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSTfOOXjLWZ4ybf860vCZvsGw9QYjAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiEAx5tbusKo
+DKK7ZQ0s3gqwSsknHxdyk8K1ZP62hbX+qIsCIAgtGKzY084Kcs0GgQ8ZV+QPo6cr
+ZlR68eDTinWpgogk
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Key.der
new file mode 100644
index 00000000000000..3b2d9da06743f1
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Key.pem
new file mode 100644
index 00000000000000..1f60e584a80b4b
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801A-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHFty3rTAbox0x8e/qiolINh4zNKwEUVusbcrJJxIxSkoAoGCCqGSM49
+AwEHoUQDQgAEDY0JykmbnGiMZQsj2/z3h0i6nFLdm2Cm/CTtQUamxfE106q5BcCQ
+7hMGI86hP/UnJgxABQ7K5VlxLeT8h5FWsA==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Cert.der
new file mode 100644
index 00000000000000..b669616e168682
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Cert.pem
new file mode 100644
index 00000000000000..2f73de2db0ff87
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIIO53FcIli1TMwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMUIxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxQjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABJqYDESTvkSABeytVlyTtmtkCBlv5g9DFauF47fbguDiXS5RdimYhky1BunK
+ba70DS0YKP47r5ygOTeOXDzK5yejYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBRUukNcQXd5VWyr+6eewRhqBwXy9DAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNJADBGAiEA5vglop95
+NFBcbiGvt3BzyfvG9z+EYbSIFNPq+UQ3qSECIQDgnKygE5ZY/XpaAD2AfGuM9mnz
+n8ThFPCsMzKUH2Mfhg==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Key.der
new file mode 100644
index 00000000000000..912df77bc6b103
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Key.pem
new file mode 100644
index 00000000000000..43ff18cb3fe94e
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801B-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILJ8A/5J+uNCYlBirFeThUktNixoimfRHDYOIIEQ3gOJoAoGCCqGSM49
+AwEHoUQDQgAEmpgMRJO+RIAF7K1WXJO2a2QIGW/mD0MVq4Xjt9uC4OJdLlF2KZiG
+TLUG6cptrvQNLRgo/juvnKA5N45cPMrnJw==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Cert.der
new file mode 100644
index 00000000000000..ef227602dc6bc2
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Cert.pem
new file mode 100644
index 00000000000000..e5cfa6cc35dd3f
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIV6tIG46+WD4wCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMUMxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxQzBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABF8Wkff6mx4bVW1ZUp4iHnk/yj+WmTkXW8xKbRpgxXgnYjFf07UeDM1i+VVa
+wL5yIz+WGBwMaQFyyNMBEJCKgkmjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBS2wexMcwo4GUZSXi/Gb2zmlGKGGjAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiAUkKqXTgUq
+BxheOxRYQlaa1tolWR4DOIcpOOvKA5rpFAIhAMuiFxnZc+rAjF/X3aAigNMfA9k7
+Gi9sQy4On1My5ESz
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Key.der
new file mode 100644
index 00000000000000..b339fb7ee40c87
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Key.pem
new file mode 100644
index 00000000000000..1bddeb093d03e0
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801C-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHHFNGM6zq8NWGhqXHGwc7xf8wgBawsMFJWSqIANJQLjoAoGCCqGSM49
+AwEHoUQDQgAEXxaR9/qbHhtVbVlSniIeeT/KP5aZORdbzEptGmDFeCdiMV/TtR4M
+zWL5VVrAvnIjP5YYHAxpAXLI0wEQkIqCSQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Cert.der
new file mode 100644
index 00000000000000..b350572a3798eb
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Cert.pem
new file mode 100644
index 00000000000000..2dac496537e2bc
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIdMHkiBNPKMQwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMUQxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxRDBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABGQlckslhufQscGwG5WcAKBNgbJkKzBYFCgC7BCqLStA7qUpMPO87hQZXFMJ
+6AnYoDgTcmAWG7u+J2c7ZlfgVhmjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBSfd2/QkD6okRqEk5Gx0UuQX572IjAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiEApsa8vSH0
+lFSwc7ueb7Xe9iprJUlF1aXiRA/6E9KbsYsCIA2Mu5CvlMPr6kPol/gQVP+twMR6
+UESUQO8V4UTIm+oe
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Key.der
new file mode 100644
index 00000000000000..7a3099acf95291
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Key.pem
new file mode 100644
index 00000000000000..2e03a9105f2035
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801D-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIW2mh1y1LqhzvRfKQVbrYOiTBwm96muD2Oau21SMU0FoAoGCCqGSM49
+AwEHoUQDQgAEZCVySyWG59CxwbAblZwAoE2BsmQrMFgUKALsEKotK0DupSkw87zu
+FBlcUwnoCdigOBNyYBYbu74nZztmV+BWGQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Cert.der
new file mode 100644
index 00000000000000..c99d1288e89854
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Cert.pem
new file mode 100644
index 00000000000000..0616200d9c4448
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIILJfftVo63ygwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMUUxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxRTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABL/uXBQFEWhU2+4xYR+tEeDz9ygPkuxKSrOoqprlgKvg34nVHHxkfReFHdAz
+tD9vMA+xxWk48/GI59kqBviY3BWjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQKmmr+EAY8oSrTGz6bBrBK9Q3gnDAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNJADBGAiEA0g9glVQX
+Uy476M6IdFhbRreBC7Nbz4y+azXrIsWD94ECIQCEg0Z4LkwDSEAbKJQRRBfTeMnF
+yXshfDHh/wj7u821QA==
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Key.der
new file mode 100644
index 00000000000000..a1d7c7d533f7b5
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Key.pem
new file mode 100644
index 00000000000000..53cedede8635e0
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801E-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIBTFeuM4TmZ/ewmV70YmOolghqD2724usLx2nZtmwLJdoAoGCCqGSM49
+AwEHoUQDQgAEv+5cFAURaFTb7jFhH60R4PP3KA+S7EpKs6iqmuWAq+DfidUcfGR9
+F4Ud0DO0P28wD7HFaTjz8Yjn2SoG+JjcFQ==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Cert.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Cert.der
new file mode 100644
index 00000000000000..4c47f380098a58
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Cert.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Cert.pem
new file mode 100644
index 00000000000000..f7745d85811baa
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY6gAwIBAgIIS4+VMf7jS1MwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+TWF0dGVyIERldiBQQUkgMHhGRkYzIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjMwIBcNMjMwMzA3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+HE1hdHRlciBEZXYgREFDIDB4RkZGMy8weDgwMUYxFDASBgorBgEEAYKifAIBDARG
+RkYzMRQwEgYKKwYBBAGConwCAgwEODAxRjBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABCaVsP18XrYuIfutPFgcBmd7h6Q/nZJNCLnzOQrhjFF+B3UlRwjHxT4jFEsg
+3uHzJpyVfsqrRBwM9qVMe6d0cLejYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+BAQDAgeAMB0GA1UdDgQWBBQsgvDLK3tqldVA8A0jSQ1PM9JCUzAfBgNVHSMEGDAW
+gBQ0l0LmFX9/0BScVTK2m34siOSnazAKBggqhkjOPQQDAgNIADBFAiEAr7FLCGGB
+3uVXWO5TimGsQiyEQpUlOoFXzSWBf55T94QCIHtgRUzU/OPNLVX2TpVJLpB98lZB
+fx0f1EA+VU13P9x+
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Key.der b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Key.der
new file mode 100644
index 00000000000000..a2545c91f63382
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Key.pem b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Key.pem
new file mode 100644
index 00000000000000..041794d03ce796
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-DAC-FFF3-801F-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIMvVRqI6grjyYXOTzqbMb8CGmyDtAwyEeG1YOIULPKc/oAoGCCqGSM49
+AwEHoUQDQgAEJpWw/Xxeti4h+608WBwGZ3uHpD+dkk0IufM5CuGMUX4HdSVHCMfF
+PiMUSyDe4fMmnJV+yqtEHAz2pUx7p3Rwtw==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/development/attestation/Matter-Development-PAI-noPID-Cert.der b/Credentials/development/attestation/Matter-Development-PAI-FFF1-noPID-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-PAI-noPID-Cert.der
rename to Credentials/development/attestation/Matter-Development-PAI-FFF1-noPID-Cert.der
diff --git a/Credentials/development/attestation/Matter-Development-PAI-FFF1-noPID-Key.der b/Credentials/development/attestation/Matter-Development-PAI-FFF1-noPID-Key.der
new file mode 100644
index 00000000000000..58a6235850ad5d
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-PAI-FFF1-noPID-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Cert.der b/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Cert.der
new file mode 100644
index 00000000000000..2c980644c9080c
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Cert.pem b/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Cert.pem
new file mode 100644
index 00000000000000..91d0f0d6ae46c1
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBtTCCAVugAwIBAgIIPVijqn9OupQwCgYIKoZIzj0EAwIwGjEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMCAXDTIzMDMwNzAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5
+WjA9MSUwIwYDVQQDDBxNYXR0ZXIgRGV2IFBBSSAweEZGRjIgbm8gUElEMRQwEgYK
+KwYBBAGConwCAQwERkZGMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAR6EsYg
+4XGoD+oi82/7H2zfy5uAZWYr272CjEW4+cNQR7mSUB59cFT4XAWr4vfHS+2aejeu
+6QN0z2MvSz0opAqjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBSrX6M7Of8o1zgKu1YHN4/w73uL1jAfBgNVHSMEGDAWgBR4
+XOcFuGuPTm/Hk6pgy0PqaWiC1TAKBggqhkjOPQQDAgNIADBFAiAzOARWc9iehhgg
+YMD6pDmcOpubsxKe3yWJTMzDyVctCQIhAMgqK+y1EkxOQvQzStv4cCrusjsDDv38
+9EyhAE/Bx8Lg
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Key.der b/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Key.der
new file mode 100644
index 00000000000000..e9d5ed68515b84
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Key.pem b/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Key.pem
new file mode 100644
index 00000000000000..dc5c040aed8e91
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-PAI-FFF2-noPID-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIEqCYuiGgoVofouoZQtj4wulBmzSUZynWCLcpdXevyLIoAoGCCqGSM49
+AwEHoUQDQgAEBHoSxiDhcagP6iLzb/sfbN/Lm4BlZivbvYKMRbj5w1BHuZJQHn1w
+VPhcBavi98dL7Zp6N67pA3TPYy9LPSikCg==
+-----END EC PRIVATE KEY-----
diff --git a/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Cert.der b/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Cert.der
new file mode 100644
index 00000000000000..4f7da22d050a7c
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Cert.der differ
diff --git a/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Cert.pem b/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Cert.pem
new file mode 100644
index 00000000000000..7cf38193c8549d
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBtDCCAVugAwIBAgIII1gQG/lNcfkwCgYIKoZIzj0EAwIwGjEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMCAXDTIzMDMwNzAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5
+WjA9MSUwIwYDVQQDDBxNYXR0ZXIgRGV2IFBBSSAweEZGRjMgbm8gUElEMRQwEgYK
+KwYBBAGConwCAQwERkZGMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABPqpENA7
+VKBBzX4+EIXG6imTNOUitkI6xJBxC9VLMia/E4vt+F3t4UtPu69CiHBmN5aHHomh
+F4su0ghUn7jkmZCjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBQ0l0LmFX9/0BScVTK2m34siOSnazAfBgNVHSMEGDAWgBR4
+XOcFuGuPTm/Hk6pgy0PqaWiC1TAKBggqhkjOPQQDAgNHADBEAiB9saHg/Xar3f8d
+h4NhsBEmftbjIpm8pjeadyH7HFYC9wIgWQkAXTqb2ulouEW6XBAmxgFCqUBB93DV
+UMBSxboUT7I=
+-----END CERTIFICATE-----
diff --git a/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Key.der b/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Key.der
new file mode 100644
index 00000000000000..360eb4a5786bb2
Binary files /dev/null and b/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Key.der differ
diff --git a/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Key.pem b/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Key.pem
new file mode 100644
index 00000000000000..c89ae762bd8545
--- /dev/null
+++ b/Credentials/development/attestation/Matter-Development-PAI-FFF3-noPID-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHd7ML97ql1dycqdC5MBy2/qDpKJbJcRaPyV/K2GVEWIoAoGCCqGSM49
+AwEHoUQDQgAE+qkQ0DtUoEHNfj4QhcbqKZM05SK2QjrEkHEL1UsyJr8Ti+34Xe3h
+S0+7r0KIcGY3loceiaEXiy7SCFSfuOSZkA==
+-----END EC PRIVATE KEY-----
diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
index 2b983e36a0761f..a878b95ee3f5b8 100644
--- a/config/esp32/components/chip/CMakeLists.txt
+++ b/config/esp32/components/chip/CMakeLists.txt
@@ -137,7 +137,9 @@ if (CONFIG_ENABLE_CHIP_SHELL)
     chip_gn_arg_append("chip_build_libshell"                "true")
 endif()
 
-if (CONFIG_IDF_TARGET_ESP32H2)
+if (CONFIG_ENABLE_WIFI_STATION OR CONFIG_ENABLE_WIFI_AP)
+    chip_gn_arg_append("chip_enable_wifi"                       "true")
+else()
     chip_gn_arg_append("chip_enable_wifi"                       "false")
 endif()
 
@@ -286,20 +288,22 @@ target_include_directories(${COMPONENT_LIB} INTERFACE
 idf_component_get_property(esp32_mbedtls_lib esp32_mbedtls COMPONENT_LIB)
 
 if(CONFIG_BT_ENABLED)
+    idf_component_get_property(bt_lib bt COMPONENT_LIB)
     if("${CONFIG_IDF_TARGET}" STREQUAL "esp32h2")
-        idf_component_get_property(bt_lib bt COMPONENT_LIB)
         idf_component_get_property(bt_dir bt COMPONENT_DIR)
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}>)
         if(CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2)
             list(APPEND chip_libraries ${bt_dir}/controller/lib_esp32h2/esp32h2-bt-lib/beta2/libble_app.a)
         endif()
     elseif("${CONFIG_IDF_TARGET}" STREQUAL "esp32c2")
-        idf_component_get_property(bt_lib bt COMPONENT_LIB)
         idf_component_get_property(bt_dir bt COMPONENT_DIR)
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}>)
         list(APPEND chip_libraries ${bt_dir}/controller/lib_esp32c2/esp32c2-bt-lib/libble_app.a)
+    elseif("${CONFIG_IDF_TARGET}" STREQUAL "esp32c6")
+        idf_component_get_property(bt_dir bt COMPONENT_DIR)
+        list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}>)
+        list(APPEND chip_libraries ${bt_dir}/controller/lib_esp32c6/esp32c6-bt-lib/libble_app.a)
     else()
-        idf_component_get_property(bt_lib bt COMPONENT_LIB)
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}> -lbtdm_app)
     endif()
 endif()
@@ -314,7 +318,7 @@ if(CONFIG_OPENTHREAD_ENABLED)
     list(APPEND chip_libraries $<TARGET_FILE:${openthread_lib}>)
 endif()
 
-if((NOT CONFIG_USE_MINIMAL_MDNS) AND (NOT CONFIG_IDF_TARGET_ESP32H2))
+if((NOT CONFIG_USE_MINIMAL_MDNS) AND (CONFIG_ENABLE_WIFI_STATION OR CONFIG_ENABLE_WIFI_AP))
     idf_build_get_property(build_components BUILD_COMPONENTS)
     # For IDF v5.x, the mdns component was moved to idf_managed_components.
     # We should use 'espressif__mdns' for 'idf_component_get_property'.
diff --git a/credentials/development/attestation/Matter-Development-DAC-8000-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8000-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8000-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8000-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8000-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8000-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8000-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8000-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8000-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8000-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8000-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8000-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8000-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8000-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8000-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8000-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8001-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8001-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8001-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8001-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8001-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8001-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8001-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8001-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8001-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8001-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8001-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8001-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8001-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8001-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8001-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8001-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8002-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8002-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8002-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8002-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8002-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8002-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8002-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8002-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8002-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8002-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8002-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8002-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8002-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8002-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8002-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8002-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8003-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8003-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8003-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8003-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8003-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8003-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8003-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8003-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8003-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8003-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8003-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8003-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8003-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8003-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8003-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8003-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8004-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8004-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8004-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8004-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8004-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8004-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8004-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8004-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8004-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8004-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8004-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8004-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8004-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8004-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8004-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8004-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8005-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8005-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8005-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8005-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8005-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8005-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8005-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8005-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8005-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8005-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8005-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8005-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8005-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8005-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8005-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8005-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8006-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8006-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8006-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8006-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8006-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8006-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8006-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8006-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8006-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8006-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8006-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8006-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8006-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8006-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8006-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8006-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8007-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8007-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8007-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8007-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8007-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8007-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8007-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8007-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8007-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8007-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8007-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8007-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8007-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8007-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8007-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8007-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8008-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8008-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8008-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8008-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8008-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8008-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8008-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8008-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8008-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8008-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8008-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8008-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8008-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8008-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8008-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8008-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8009-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8009-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8009-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8009-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8009-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8009-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8009-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8009-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8009-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8009-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8009-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8009-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8009-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8009-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8009-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8009-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800A-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800A-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800A-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800A-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800A-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800A-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800A-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800A-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800A-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800A-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800A-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800A-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800A-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800A-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800A-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800A-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800B-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800B-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800B-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800B-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800B-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800B-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800B-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800B-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800B-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800B-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800B-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800B-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800B-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800B-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800B-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800B-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800C-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800C-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800C-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800C-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800C-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800C-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800C-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800C-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800C-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800C-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800C-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800C-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800C-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800C-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800C-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800C-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800D-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800D-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800D-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800D-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800D-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800D-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800D-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800D-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800D-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800D-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800D-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800D-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800D-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800D-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800D-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800D-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800E-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800E-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800E-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800E-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800E-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800E-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800E-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800E-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800E-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800E-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800E-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800E-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800E-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800E-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800E-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800E-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800F-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800F-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800F-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800F-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800F-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800F-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800F-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800F-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-800F-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-800F-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800F-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800F-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-800F-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-800F-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-800F-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-800F-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8010-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8010-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8010-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8010-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8010-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8010-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8010-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8010-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8010-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8010-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8010-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8010-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8010-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8010-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8010-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8010-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8011-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8011-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8011-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8011-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8011-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8011-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8011-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8011-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8011-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8011-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8011-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8011-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8011-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8011-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8011-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8011-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8012-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8012-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8012-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8012-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8012-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8012-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8012-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8012-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8012-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8012-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8012-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8012-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8012-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8012-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8012-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8012-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8013-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8013-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8013-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8013-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8013-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8013-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8013-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8013-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8013-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8013-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8013-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8013-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8013-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8013-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8013-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8013-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8014-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8014-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8014-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8014-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8014-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8014-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8014-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8014-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8014-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8014-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8014-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8014-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8014-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8014-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8014-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8014-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8015-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8015-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8015-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8015-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8015-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8015-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8015-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8015-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8015-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8015-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8015-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8015-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8015-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8015-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8015-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8015-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8016-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8016-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8016-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8016-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8016-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8016-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8016-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8016-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8016-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8016-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8016-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8016-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8016-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8016-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8016-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8016-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8017-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8017-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8017-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8017-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8017-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8017-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8017-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8017-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8017-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8017-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8017-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8017-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8017-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8017-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8017-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8017-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8018-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8018-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8018-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8018-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8018-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8018-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8018-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8018-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8018-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8018-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8018-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8018-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8018-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8018-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8018-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8018-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8019-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8019-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8019-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8019-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8019-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8019-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8019-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8019-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-8019-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-8019-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8019-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8019-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-8019-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-8019-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-8019-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-8019-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801A-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801A-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801A-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801A-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801A-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801A-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801A-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801A-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801A-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801A-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801A-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801A-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801A-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801A-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801A-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801A-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801B-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801B-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801B-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801B-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801B-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801B-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801B-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801B-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801B-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801B-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801B-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801B-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801B-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801B-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801B-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801B-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801C-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801C-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801C-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801C-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801C-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801C-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801C-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801C-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801C-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801C-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801C-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801C-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801C-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801C-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801C-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801C-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801D-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801D-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801D-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801D-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801D-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801D-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801D-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801D-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801D-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801D-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801D-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801D-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801D-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801D-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801D-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801D-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801E-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801E-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801E-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801E-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801E-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801E-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801E-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801E-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801E-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801E-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801E-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801E-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801E-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801E-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801E-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801E-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801F-Cert.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801F-Cert.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801F-Cert.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801F-Cert.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801F-Cert.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801F-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801F-Cert.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801F-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-DAC-801F-Key.der b/credentials/development/attestation/Matter-Development-DAC-FFF1-801F-Key.der
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801F-Key.der
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801F-Key.der
diff --git a/credentials/development/attestation/Matter-Development-DAC-801F-Key.pem b/credentials/development/attestation/Matter-Development-DAC-FFF1-801F-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-DAC-801F-Key.pem
rename to credentials/development/attestation/Matter-Development-DAC-FFF1-801F-Key.pem
diff --git a/credentials/development/attestation/Matter-Development-PAI-noPID-Cert.pem b/credentials/development/attestation/Matter-Development-PAI-FFF1-noPID-Cert.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-PAI-noPID-Cert.pem
rename to credentials/development/attestation/Matter-Development-PAI-FFF1-noPID-Cert.pem
diff --git a/credentials/development/attestation/Matter-Development-PAI-noPID-Key.pem b/credentials/development/attestation/Matter-Development-PAI-FFF1-noPID-Key.pem
similarity index 100%
rename from credentials/development/attestation/Matter-Development-PAI-noPID-Key.pem
rename to credentials/development/attestation/Matter-Development-PAI-FFF1-noPID-Key.pem
diff --git a/docs/guides/esp32/setup_idf_chip.md b/docs/guides/esp32/setup_idf_chip.md
index ea28805f5921a4..63303c79a5dfca 100644
--- a/docs/guides/esp32/setup_idf_chip.md
+++ b/docs/guides/esp32/setup_idf_chip.md
@@ -40,8 +40,8 @@ step.
     ```
 
 -   For ESP32H2, please checkout tag
-    [v5.0-beta1](https://github.com/espressif/esp-idf/tree/v5.0-beta1),
-    currently only lighting-app is supported on H2
+    [v5.0](https://github.com/espressif/esp-idf/tree/v5.0), currently only
+    lighting-app is supported on H2
 
     ```
     $ cd esp-idf
@@ -50,6 +50,16 @@ step.
     $ ./install.sh
     ```
 
+-   For ESP32C6, please use commit
+    [afbdb0f3e](https://github.com/espressif/esp-idf/tree/afbdb0f3e).
+
+    ```
+    $ cd esp-idf
+    $ git checkout afbdb0f3e
+    $ git submodule update --init
+    $ ./install.sh
+    ```
+
 ## Setup Matter environment
 
 ### Install Prerequisites
diff --git a/examples/all-clusters-app/esp32/CMakeLists.txt b/examples/all-clusters-app/esp32/CMakeLists.txt
index e1eb655da1c9e9..dc92f0c65b2e19 100644
--- a/examples/all-clusters-app/esp32/CMakeLists.txt
+++ b/examples/all-clusters-app/esp32/CMakeLists.txt
@@ -47,6 +47,8 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-secur
 # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
 idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND)
 
+idf_build_set_property(COMPILE_OPTIONS "-Wno-error=array-bounds" APPEND)
+
 flashing_script()
 
 if (CONFIG_ENABLE_PW_RPC)
diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
index f09f3369862640..02d6693e20fecf 100644
--- a/examples/all-clusters-app/esp32/main/CMakeLists.txt
+++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -21,7 +21,7 @@ set(PRIV_INCLUDE_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}/include"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlfaultinjection/repo/include"                      
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlfaultinjection/repo/include"
 )
 set(SRC_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}"
@@ -40,9 +40,9 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/test-cluster-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/descriptor"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fault-injection-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fan-control-server"                      
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fan-control-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fixed-label-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/user-label-server"                           
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/user-label-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/on-off-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/level-control"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/identify-server"
@@ -67,7 +67,7 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/target-navigator-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thermostat-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thermostat-user-interface-configuration-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thread-network-diagnostics-server" 
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thread-network-diagnostics-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/channel-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/scenes"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/software-diagnostics-server"
@@ -83,8 +83,8 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/localization-configuration-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-format-localization-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/wifi-network-diagnostics-server"                      
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/wake-on-lan-server"                      
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/wifi-network-diagnostics-server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/wake-on-lan-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/pump-configuration-and-control-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-configuration-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-server"
@@ -108,7 +108,7 @@ set(SRC_DIRS_LIST  "${SRC_DIRS_LIST}"
 )
 endif (CONFIG_ENABLE_PW_RPC)
 
-if(("${CONFIG_DEVICE_TYPE_ESP32_DEVKITC}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_C2_DEVKITM}" STREQUAL "y"))
+if(("${CONFIG_DEVICE_TYPE_ESP32_DEVKITC}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_C2_DEVKITM}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_C6_DEVKITC}" STREQUAL "y"))
     list(APPEND PRIV_INCLUDE_DIRS_LIST
                 "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/screen-framework/include")
     set(PRIV_REQUIRES_LIST chip QRCode bt)
diff --git a/examples/all-clusters-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-app/esp32/main/Kconfig.projbuild
index 4f9e071eb8a5dd..8ed41e03971ef3 100644
--- a/examples/all-clusters-app/esp32/main/Kconfig.projbuild
+++ b/examples/all-clusters-app/esp32/main/Kconfig.projbuild
@@ -25,6 +25,7 @@ menu "Demo"
         default DEVICE_TYPE_ESP32_DEVKITC if IDF_TARGET_ESP32
         default DEVICE_TYPE_ESP32_C3_DEVKITM if IDF_TARGET_ESP32C3
         default DEVICE_TYPE_ESP32_C2_DEVKITM if IDF_TARGET_ESP32C2
+        default DEVICE_TYPE_ESP32_C6_DEVKITC if IDF_TARGET_ESP32C6
         help
             Specifies the type of ESP32 device.
 
@@ -50,6 +51,9 @@ menu "Demo"
         config DEVICE_TYPE_ESP32_C2_DEVKITM
             bool "ESP32C2-DevKitM"
             depends on IDF_TARGET_ESP32C2
+        config DEVICE_TYPE_ESP32_C6_DEVKITC
+            bool "ESP32C6-DevKitC"
+            depends on IDF_TARGET_ESP32C6
     endchoice
 
     choice
@@ -81,7 +85,7 @@ menu "Demo"
         int
         range 0 5
         default 0 if DEVICE_TYPE_ESP32_DEVKITC
-        default 0 if DEVICE_TYPE_ESP32_C3_DEVKITM || DEVICE_TYPE_ESP32_C2_DEVKITM
+        default 0 if DEVICE_TYPE_ESP32_C3_DEVKITM || DEVICE_TYPE_ESP32_C2_DEVKITM || DEVICE_TYPE_ESP32_C6_DEVKITC
         default 3 if DEVICE_TYPE_M5STACK
         default 4 if DEVICE_TYPE_ESP32_WROVER_KIT
 
@@ -102,12 +106,12 @@ menu "Demo"
             To reduce wear and heat the M5Stack's Display is automatically switched off after a few seconds
 
     config STATUS_LED_GPIO_NUM
-        int 
+        int
         range 0 40
-        default 2 if DEVICE_TYPE_ESP32_DEVKITC         #Use LED1 (blue LED) as status LED on DevKitC      
+        default 2 if DEVICE_TYPE_ESP32_DEVKITC         #Use LED1 (blue LED) as status LED on DevKitC
         default 2 if DEVICE_TYPE_ESP32_ETHERNET_KIT
-        default 8 if DEVICE_TYPE_ESP32_C3_DEVKITM || DEVICE_TYPE_ESP32_C2_DEVKITM
-        default 26 if DEVICE_TYPE_ESP32_WROVER_KIT     
+        default 8 if DEVICE_TYPE_ESP32_C3_DEVKITM || DEVICE_TYPE_ESP32_C2_DEVKITM || DEVICE_TYPE_ESP32_C6_DEVKITC
+        default 26 if DEVICE_TYPE_ESP32_WROVER_KIT
         default 40 if DEVICE_TYPE_M5STACK
         help
             Each board has a status led, define its pin number.
diff --git a/examples/all-clusters-app/esp32/main/LEDWidget.cpp b/examples/all-clusters-app/esp32/main/LEDWidget.cpp
index 13dcdc4893c2cf..4a95c13b09a46e 100644
--- a/examples/all-clusters-app/esp32/main/LEDWidget.cpp
+++ b/examples/all-clusters-app/esp32/main/LEDWidget.cpp
@@ -30,7 +30,7 @@
 #include "esp_log.h"
 #include "esp_system.h"
 #include "esp_timer.h"
-#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM || CONFIG_DEVICE_TYPE_ESP32_C6_DEVKITC
 #include "driver/rmt.h"
 #include "led_strip.h"
 #define RMT_TX_DEFAULT_GPIO GPIO_NUM_8
@@ -51,7 +51,7 @@ void LEDWidget::Init(gpio_num_t gpioNum)
     mState            = false;
     mError            = false;
     errorTimer        = NULL;
-#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM || CONFIG_DEVICE_TYPE_ESP32_C6_DEVKITC
     if (gpioNum == RMT_TX_DEFAULT_GPIO)
     {
         rmt_config_t config = RMT_DEFAULT_CONFIG_TX(RMT_TX_DEFAULT_GPIO, RMT_TX_DEFAULT_CHANNEL);
@@ -98,7 +98,7 @@ void LEDWidget::Set(bool state)
 
 void LEDWidget::SetBrightness(uint8_t brightness)
 {
-#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM || CONFIG_DEVICE_TYPE_ESP32_C6_DEVKITC
     if (strip)
     {
         uint8_t red, green, blue;
@@ -186,7 +186,7 @@ void LEDWidget::DoSet(bool state)
 {
     bool stateChange = (mState != state);
     mState           = state;
-#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM || CONFIG_DEVICE_TYPE_ESP32_C6_DEVKITC
     if (strip)
     {
         uint8_t red, green, blue;
@@ -229,7 +229,7 @@ void LEDWidget::SetVLED(int id1, int id2)
 }
 #endif
 
-#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM || CONFIG_DEVICE_TYPE_ESP32_C6_DEVKITC
 void LEDWidget::SetColor(uint8_t Hue, uint8_t Saturation)
 {
     uint8_t red, green, blue;
diff --git a/examples/all-clusters-app/esp32/main/OpenThreadLaunch.cpp b/examples/all-clusters-app/esp32/main/OpenThreadLaunch.cpp
deleted file mode 100644
index e3372456226e0b..00000000000000
--- a/examples/all-clusters-app/esp32/main/OpenThreadLaunch.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 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.
- */
-
-#include "OpenThreadLaunch.h"
-
-#include "sdkconfig.h"
-
-#if CONFIG_OPENTHREAD_ENABLED
-
-#include <stdio.h>
-#include <unistd.h>
-
-#include "driver/uart.h"
-#include "esp_err.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "esp_netif_types.h"
-#include "esp_openthread.h"
-#include "esp_openthread_lock.h"
-#include "esp_openthread_netif_glue.h"
-#include "esp_openthread_types.h"
-#include "esp_vfs_eventfd.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "hal/uart_types.h"
-#include "openthread/instance.h"
-#include "openthread/logging.h"
-#include "openthread/platform/logging.h"
-#include "sdkconfig.h"
-
-#if CONFIG_IDF_TARGET_ESP32H2
-#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                                                      \
-    {                                                                                                                              \
-        .radio_mode = RADIO_MODE_NATIVE,                                                                                           \
-    }
-#else
-#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                                                      \
-    {                                                                                                                              \
-        .radio_mode = RADIO_MODE_UART_RCP,                    \
-        .radio_uart_config = {                                \
-            .port = 1,                                        \
-            .uart_config =                                    \
-                {                                             \
-                    .baud_rate = 115200,                      \
-                    .data_bits = UART_DATA_8_BITS,            \
-                    .parity = UART_PARITY_DISABLE,            \
-                    .stop_bits = UART_STOP_BITS_1,            \
-                    .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,    \
-                    .rx_flow_ctrl_thresh = 0,                 \
-                    .source_clk = UART_SCLK_APB,              \
-                },                                            \
-            .rx_pin = 4,                                      \
-            .tx_pin = 5,                                      \
-        },                                                                    \
-    }
-#endif
-
-#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                                                                       \
-    {                                                                                                                              \
-        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                                                                         \
-    }
-
-#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                                                                       \
-    {                                                                                                                              \
-        .storage_partition_name = "ot_storage", .netif_queue_size = 10, .task_queue_size = 10,                                     \
-    }
-
-static void OpenThreadTask(void * aContext)
-{
-    esp_openthread_platform_config_t config = {
-        .radio_config = ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG(),
-        .host_config  = ESP_OPENTHREAD_DEFAULT_HOST_CONFIG(),
-        .port_config  = ESP_OPENTHREAD_DEFAULT_PORT_CONFIG(),
-    };
-
-    // Initialize the OpenThread stack
-    ESP_ERROR_CHECK(esp_openthread_init(&config));
-    (void) otLoggingSetLevel(OT_LOG_LEVEL_INFO);
-
-    // Run the main loop
-    esp_openthread_launch_mainloop();
-
-    esp_vfs_eventfd_unregister();
-    vTaskDelete(NULL);
-}
-
-void LaunchOpenThread()
-{
-    esp_vfs_eventfd_config_t eventfd_config = {
-        .max_fds = 3,
-    };
-    ESP_ERROR_CHECK(esp_vfs_eventfd_register(&eventfd_config));
-    xTaskCreate(OpenThreadTask, "ot", 10240, xTaskGetCurrentTaskHandle(), 5, NULL);
-}
-
-#endif // CONFIG_OPENTHREAD_ENABLED
diff --git a/examples/all-clusters-app/esp32/main/include/DeviceCallbacks.h b/examples/all-clusters-app/esp32/main/include/DeviceCallbacks.h
index db97219ed86c9e..8a9dec23c8b84b 100644
--- a/examples/all-clusters-app/esp32/main/include/DeviceCallbacks.h
+++ b/examples/all-clusters-app/esp32/main/include/DeviceCallbacks.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include <binding-handler.h>
 #include <common/CHIPDeviceManager.h>
 #include <common/CommonDeviceCallbacks.h>
 
@@ -50,4 +51,5 @@ class AppDeviceCallbacksDelegate : public DeviceCallbacksDelegate
 public:
     void OnIPv4ConnectivityEstablished(void) override;
     void OnIPv4ConnectivityLost(void) override;
+    void OnDnssdInitialized(void) override { InitBindingHandlers(); }
 };
diff --git a/examples/all-clusters-app/esp32/main/include/LEDWidget.h b/examples/all-clusters-app/esp32/main/include/LEDWidget.h
index 8ce4323329854d..195e44196e2fa7 100644
--- a/examples/all-clusters-app/esp32/main/include/LEDWidget.h
+++ b/examples/all-clusters-app/esp32/main/include/LEDWidget.h
@@ -47,7 +47,7 @@ class LEDWidget
     void BlinkOnError();
 
     void Animate();
-#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM || CONFIG_DEVICE_TYPE_ESP32_C6_DEVKITC
     void SetColor(uint8_t Hue, uint8_t Saturation);
 
     void HSB2rgb(uint16_t Hue, uint8_t Saturation, uint8_t brightness, uint8_t & red, uint8_t & green, uint8_t & blue);
@@ -61,7 +61,7 @@ class LEDWidget
     uint32_t mBlinkOnTimeMS;
     uint32_t mBlinkOffTimeMS;
     uint8_t mDefaultOnBrightness;
-#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+#if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM || CONFIG_DEVICE_TYPE_ESP32_C6_DEVKITC
     uint16_t mHue;       // mHue [0, 360]
     uint8_t mSaturation; // mSaturation [0, 100]
 #endif
diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
index 507fb3349a960d..94bf4afcc2e5e2 100644
--- a/examples/all-clusters-app/esp32/main/main.cpp
+++ b/examples/all-clusters-app/esp32/main/main.cpp
@@ -21,7 +21,6 @@
 #include "DeviceCallbacks.h"
 #include "Globals.h"
 #include "LEDWidget.h"
-#include "OpenThreadLaunch.h"
 #include "QRCodeScreen.h"
 #include "ShellCommands.h"
 #include "WiFiWidget.h"
@@ -41,6 +40,7 @@
 #include <common/Esp32AppServer.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <platform/ESP32/ESP32Utils.h>
 
 #if CONFIG_HAVE_DISPLAY
 #include "DeviceWithDisplay.h"
@@ -114,8 +114,6 @@ static void InitServer(intptr_t context)
     // We only have network commissioning on endpoint 0.
     emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
 
-    InitBindingHandlers();
-
     CHIP_ERROR err = GetAppTask().LockInit();
     if (err != CHIP_NO_ERROR)
     {
@@ -136,6 +134,12 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
         return;
     }
+    err = esp_event_loop_create_default();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "esp_event_loop_create_default() failed: %s", esp_err_to_name(err));
+        return;
+    }
 #if CONFIG_ENABLE_PW_RPC
     chip::rpc::Init();
 #endif
@@ -150,10 +154,13 @@ extern "C" void app_main()
     CASECommands::GetInstance().Register();
 #endif // CONFIG_ENABLE_CHIP_SHELL
 
-#if CONFIG_OPENTHREAD_ENABLED
-    LaunchOpenThread();
-    ThreadStackMgr().InitThreadStack();
-#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (DeviceLayer::Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize the Wi-Fi stack");
+        return;
+    }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
     DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
@@ -182,6 +189,18 @@ extern "C" void app_main()
     {
         ESP_LOGE(TAG, "GetAppTask().StartAppTask() failed : %" CHIP_ERROR_FORMAT, error.Format());
     }
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    if (DeviceLayer::ThreadStackMgr().InitThreadStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize Thread stack");
+        return;
+    }
+    if (DeviceLayer::ThreadStackMgr().StartThreadTask() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to launch Thread task");
+        return;
+    }
+#endif
 
     chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, reinterpret_cast<intptr_t>(nullptr));
 }
diff --git a/examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c6 b/examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c6
new file mode 100644
index 00000000000000..7ef46707ea5c95
--- /dev/null
+++ b/examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c6
@@ -0,0 +1,64 @@
+CONFIG_IDF_TARGET="esp32c6"
+
+# Default to 921600 baud when flashing and monitoring device
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+
+# libsodium
+CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
+
+
+# NIMBLE
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_EXT_ADV=n
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
+
+# Disable OpenThread
+CONFIG_OPENTHREAD_ENABLED=n
+
+# Disable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=n
+
+# Use a custom partition table
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
+# LwIP config for OpenThread
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
+CONFIG_LWIP_MULTICAST_PING=y
+
+# mbedTLS
+CONFIG_MBEDTLS_HARDWARE_AES=n
+CONFIG_MBEDTLS_HARDWARE_MPI=n
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_MBEDTLS_HARDWARE_ECC=y
+CONFIG_MBEDTLS_CMAC_C=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
+
+# MDNS platform
+CONFIG_USE_MINIMAL_MDNS=y
+CONFIG_ENABLE_EXTENDED_DISCOVERY=y
+
+# FreeRTOS should use legacy API
+CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
+
+# Wi-Fi Settings
+CONFIG_ENABLE_WIFI_STATION=y
+CONFIG_ENABLE_WIFI_AP=n
+# Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
+CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
+
+# Enable OTA Requestor
+CONFIG_ENABLE_OTA_REQUESTOR=y
+
+# Enable chip shell
+CONFIG_ENABLE_CHIP_SHELL=y
diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp
index aed35e8f3950b8..333ec5886baba4 100644
--- a/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp
+++ b/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp
@@ -27,6 +27,7 @@
 #include "Globals.h"
 #include "LEDWidget.h"
 #include "WiFiWidget.h"
+#include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/CommandHandler.h>
 #include <app/clusters/identify-server/identify-server.h>
@@ -154,7 +155,7 @@ void AppDeviceCallbacks::OnLevelControlAttributeChangeCallback(EndpointId endpoi
 #if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
 void AppDeviceCallbacks::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
-    using namespace Clusters::ColorControl::Attributes;
+    using namespace chip::app::Clusters::ColorControl::Attributes;
 
     VerifyOrExit(attributeId == CurrentHue::Id || attributeId == CurrentSaturation::Id,
                  ESP_LOGI(TAG, "Unhandled AttributeId ID: '0x%" PRIx32 "'", attributeId));
diff --git a/examples/all-clusters-minimal-app/esp32/main/OpenThreadLaunch.cpp b/examples/all-clusters-minimal-app/esp32/main/OpenThreadLaunch.cpp
deleted file mode 100644
index e3372456226e0b..00000000000000
--- a/examples/all-clusters-minimal-app/esp32/main/OpenThreadLaunch.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 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.
- */
-
-#include "OpenThreadLaunch.h"
-
-#include "sdkconfig.h"
-
-#if CONFIG_OPENTHREAD_ENABLED
-
-#include <stdio.h>
-#include <unistd.h>
-
-#include "driver/uart.h"
-#include "esp_err.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "esp_netif_types.h"
-#include "esp_openthread.h"
-#include "esp_openthread_lock.h"
-#include "esp_openthread_netif_glue.h"
-#include "esp_openthread_types.h"
-#include "esp_vfs_eventfd.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "hal/uart_types.h"
-#include "openthread/instance.h"
-#include "openthread/logging.h"
-#include "openthread/platform/logging.h"
-#include "sdkconfig.h"
-
-#if CONFIG_IDF_TARGET_ESP32H2
-#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                                                      \
-    {                                                                                                                              \
-        .radio_mode = RADIO_MODE_NATIVE,                                                                                           \
-    }
-#else
-#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                                                      \
-    {                                                                                                                              \
-        .radio_mode = RADIO_MODE_UART_RCP,                    \
-        .radio_uart_config = {                                \
-            .port = 1,                                        \
-            .uart_config =                                    \
-                {                                             \
-                    .baud_rate = 115200,                      \
-                    .data_bits = UART_DATA_8_BITS,            \
-                    .parity = UART_PARITY_DISABLE,            \
-                    .stop_bits = UART_STOP_BITS_1,            \
-                    .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,    \
-                    .rx_flow_ctrl_thresh = 0,                 \
-                    .source_clk = UART_SCLK_APB,              \
-                },                                            \
-            .rx_pin = 4,                                      \
-            .tx_pin = 5,                                      \
-        },                                                                    \
-    }
-#endif
-
-#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                                                                       \
-    {                                                                                                                              \
-        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                                                                         \
-    }
-
-#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                                                                       \
-    {                                                                                                                              \
-        .storage_partition_name = "ot_storage", .netif_queue_size = 10, .task_queue_size = 10,                                     \
-    }
-
-static void OpenThreadTask(void * aContext)
-{
-    esp_openthread_platform_config_t config = {
-        .radio_config = ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG(),
-        .host_config  = ESP_OPENTHREAD_DEFAULT_HOST_CONFIG(),
-        .port_config  = ESP_OPENTHREAD_DEFAULT_PORT_CONFIG(),
-    };
-
-    // Initialize the OpenThread stack
-    ESP_ERROR_CHECK(esp_openthread_init(&config));
-    (void) otLoggingSetLevel(OT_LOG_LEVEL_INFO);
-
-    // Run the main loop
-    esp_openthread_launch_mainloop();
-
-    esp_vfs_eventfd_unregister();
-    vTaskDelete(NULL);
-}
-
-void LaunchOpenThread()
-{
-    esp_vfs_eventfd_config_t eventfd_config = {
-        .max_fds = 3,
-    };
-    ESP_ERROR_CHECK(esp_vfs_eventfd_register(&eventfd_config));
-    xTaskCreate(OpenThreadTask, "ot", 10240, xTaskGetCurrentTaskHandle(), 5, NULL);
-}
-
-#endif // CONFIG_OPENTHREAD_ENABLED
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/DeviceCallbacks.h b/examples/all-clusters-minimal-app/esp32/main/include/DeviceCallbacks.h
index db97219ed86c9e..8a9dec23c8b84b 100644
--- a/examples/all-clusters-minimal-app/esp32/main/include/DeviceCallbacks.h
+++ b/examples/all-clusters-minimal-app/esp32/main/include/DeviceCallbacks.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include <binding-handler.h>
 #include <common/CHIPDeviceManager.h>
 #include <common/CommonDeviceCallbacks.h>
 
@@ -50,4 +51,5 @@ class AppDeviceCallbacksDelegate : public DeviceCallbacksDelegate
 public:
     void OnIPv4ConnectivityEstablished(void) override;
     void OnIPv4ConnectivityLost(void) override;
+    void OnDnssdInitialized(void) override { InitBindingHandlers(); }
 };
diff --git a/examples/all-clusters-minimal-app/esp32/main/main.cpp b/examples/all-clusters-minimal-app/esp32/main/main.cpp
index 69bb15ee91d326..989c221f6de5f9 100644
--- a/examples/all-clusters-minimal-app/esp32/main/main.cpp
+++ b/examples/all-clusters-minimal-app/esp32/main/main.cpp
@@ -21,7 +21,6 @@
 #include "DeviceCallbacks.h"
 #include "Globals.h"
 #include "LEDWidget.h"
-#include "OpenThreadLaunch.h"
 #include "QRCodeScreen.h"
 #include "ShellCommands.h"
 #include "WiFiWidget.h"
@@ -42,6 +41,7 @@
 #include <common/Esp32AppServer.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <platform/ESP32/ESP32Utils.h>
 
 #if CONFIG_HAVE_DISPLAY
 #include "DeviceWithDisplay.h"
@@ -115,7 +115,6 @@ static void InitServer(intptr_t context)
     // We only have network commissioning on endpoint 0.
     emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
 
-    InitBindingHandlers();
 #if CONFIG_DEVICE_TYPE_M5STACK
     SetupPretendDevices();
 #endif
@@ -130,6 +129,12 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
         return;
     }
+    err = esp_event_loop_create_default();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "esp_event_loop_create_default() failed: %s", esp_err_to_name(err));
+        return;
+    }
 #if CONFIG_ENABLE_PW_RPC
     chip::rpc::Init();
 #endif
@@ -144,10 +149,13 @@ extern "C" void app_main()
     CASECommands::GetInstance().Register();
 #endif // CONFIG_ENABLE_CHIP_SHELL
 
-#if CONFIG_OPENTHREAD_ENABLED
-    LaunchOpenThread();
-    ThreadStackMgr().InitThreadStack();
-#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (DeviceLayer::Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize Wi-Fi stack");
+        return;
+    }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
     DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
@@ -177,6 +185,18 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "GetAppTask().StartAppTask() failed : %" CHIP_ERROR_FORMAT, error.Format());
     }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    if (DeviceLayer::ThreadStackMgr().InitThreadStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize Thread stack");
+        return;
+    }
+    if (DeviceLayer::ThreadStackMgr().StartThreadTask() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to launch Thread task");
+        return;
+    }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
     chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, reinterpret_cast<intptr_t>(nullptr));
 }
 
diff --git a/examples/android/CHIPTool/app/build.gradle b/examples/android/CHIPTool/app/build.gradle
index fc57fc86e67aee..3150e344c91ab5 100644
--- a/examples/android/CHIPTool/app/build.gradle
+++ b/examples/android/CHIPTool/app/build.gradle
@@ -107,6 +107,8 @@ dependencies {
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
     implementation "androidx.camera:camera-view:${camerax_version}"
+
+    implementation 'com.google.protobuf:protobuf-java:3.22.0'
 }
 
 repositories {
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt
index 64948f2a2c76f4..a482a6170f7766 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt
@@ -6,6 +6,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.EditText
 import android.widget.Spinner
@@ -14,17 +15,26 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import chip.devicecontroller.ChipDeviceController
 import chip.devicecontroller.ChipIdLookup
+import chip.devicecontroller.InvokeCallback
 import chip.devicecontroller.ReportCallback
 import chip.devicecontroller.ResubscriptionAttemptCallback
 import chip.devicecontroller.SubscriptionEstablishedCallback
+import chip.devicecontroller.WriteAttributesCallback
+import chip.devicecontroller.model.AttributeWriteRequest
 import chip.devicecontroller.model.ChipAttributePath
 import chip.devicecontroller.model.ChipEventPath
 import chip.devicecontroller.model.ChipPathId
+import chip.devicecontroller.model.InvokeElement
 import chip.devicecontroller.model.NodeState
+import chip.tlv.AnonymousTag
+import chip.tlv.ContextSpecificTag
+import chip.tlv.TlvWriter
 import com.google.chip.chiptool.ChipClient
 import com.google.chip.chiptool.R
 import com.google.chip.chiptool.databinding.WildcardFragmentBinding
+import com.google.protobuf.ByteString
 import java.lang.StringBuilder
+import java.util.Optional
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
@@ -64,6 +74,33 @@ class WildcardFragment : Fragment() {
     }
   }
 
+  private val writeAttributeCallback = object : WriteAttributesCallback {
+    override fun onError(attributePath: ChipAttributePath?, ex: Exception?) {
+      Log.e(TAG, "Report error for $attributePath: $ex")
+    }
+
+    override fun onResponse(attributePath: ChipAttributePath?) {
+      val text = "$attributePath : Write Success"
+      requireActivity().runOnUiThread { binding.outputTv.text = text }
+    }
+
+    override fun onDone() {
+      Log.i(TAG, "write attribute Done")
+    }
+  }
+
+  private val invokeCallback = object : InvokeCallback {
+    override fun onError(e: java.lang.Exception?) {
+      Log.e(TAG, "Report error", e)
+    }
+
+    override fun onResponse(invokeElement: InvokeElement?, successCode: Long) {
+      val text = "Invoke Response : $invokeElement, $successCode"
+      requireActivity().runOnUiThread { binding.outputTv.text = text }
+    }
+
+  }
+
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
@@ -73,8 +110,10 @@ class WildcardFragment : Fragment() {
     scope = viewLifecycleOwner.lifecycleScope
     binding.subscribeBtn.setOnClickListener { scope.launch { showSubscribeDialog(ATTRIBUTE) } }
     binding.readBtn.setOnClickListener { scope.launch { showReadDialog(ATTRIBUTE) } }
+    binding.writeBtn.setOnClickListener { scope.launch { showWriteDialog() } }
     binding.subscribeEventBtn.setOnClickListener { scope.launch { showSubscribeDialog(EVENT) } }
     binding.readEventBtn.setOnClickListener { scope.launch { showReadDialog(EVENT) } }
+    binding.invokeBtn.setOnClickListener { scope.launch { showInvokeDialog() } }
 
     addressUpdateFragment =
       childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
@@ -182,6 +221,66 @@ class WildcardFragment : Fragment() {
     }
   }
 
+  private suspend fun write(writeValueType: String, writeValue: String, dataVersion: Int?, timedRequestTimeoutMs: Int, imTimeoutMs: Int) {
+    val endpointId = getChipPathIdForText(binding.endpointIdEd.text.toString())
+    val clusterId = getChipPathIdForText(binding.clusterIdEd.text.toString())
+    val attributeId = getChipPathIdForText(binding.attributeIdEd.text.toString())
+    val tlvWriter = TlvWriter()
+    val values = writeValue.split(",")
+
+    if (values.size > 1) tlvWriter.startArray(AnonymousTag)
+    for (value in values) {
+      try {
+        TLV_MAP[writeValueType]?.generate(tlvWriter, value.trim())
+      } catch (ex: Exception) {
+        Log.e(TAG, "Invalid Data Type", ex)
+        return
+      }
+    }
+    if (values.size > 1) tlvWriter.endArray()
+
+    val version = if (dataVersion == null) { Optional.empty() } else { Optional.of(dataVersion) }
+
+    val writeRequest = AttributeWriteRequest.newInstance(endpointId, clusterId, attributeId, tlvWriter.getEncoded(), version)
+    deviceController.write(writeAttributeCallback,
+                      ChipClient.getConnectedDevicePointer(requireContext(),
+                      addressUpdateFragment.deviceId),
+                      listOf(writeRequest),
+                      timedRequestTimeoutMs,
+                      imTimeoutMs)
+  }
+
+  private suspend fun invoke(invokeField: String, timedRequestTimeoutMs: Int, imTimeoutMs: Int) {
+    val endpointId = getChipPathIdForText(binding.endpointIdEd.text.toString())
+    val clusterId = getChipPathIdForText(binding.clusterIdEd.text.toString())
+    val commandId = getChipPathIdForText(binding.commandIdEd.text.toString())
+
+    val tlvWriter = TlvWriter()
+    val fields = if (invokeField.isEmpty()) { listOf() } else { invokeField.split(",") }
+    var count = 0
+    tlvWriter.startStructure(AnonymousTag)
+    for (field in fields) {
+      try {
+        val type = field.split(":")[0]
+        val value = field.split(":")[1]
+
+        Log.d(TAG, "value : $type - $value")
+        TLV_MAP[type]?.generate(tlvWriter, value.trim(), ContextSpecificTag(count++))
+      } catch (ex: Exception) {
+        Log.e(TAG, "Invalid value", ex)
+        return
+      }
+    }
+    tlvWriter.endStructure()
+    val invokeElement = InvokeElement.newInstance(endpointId, clusterId, commandId, tlvWriter.getEncoded(), null)
+    deviceController.invoke(invokeCallback,
+            ChipClient.getConnectedDevicePointer(requireContext(),
+                    addressUpdateFragment.deviceId),
+            invokeElement,
+            timedRequestTimeoutMs,
+            imTimeoutMs)
+  }
+
   private fun showReadDialog(type: Int) {
     val dialogView = requireActivity().layoutInflater.inflate(R.layout.read_dialog, null)
     val dialog = AlertDialog.Builder(requireContext()).apply {
@@ -198,6 +297,33 @@ class WildcardFragment : Fragment() {
     dialog.show()
   }
 
+  private fun showWriteDialog() {
+    binding.outputTv.text = ""
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.write_dialog, null)
+    val writeValueTypeSp = dialogView.findViewById<Spinner>(R.id.writeValueTypeSp)
+    val spinnerAdapter = ArrayAdapter(requireActivity(), android.R.layout.simple_spinner_item, TLV_MAP.keys.toList())
+    writeValueTypeSp.adapter = spinnerAdapter
+    val dialog = AlertDialog.Builder(requireContext()).apply {
+      setView(dialogView)
+    }.create()
+
+    dialogView.findViewById<Button>(R.id.writeBtn).setOnClickListener {
+      val writeValue = dialogView.findViewById<EditText>(R.id.writeValueEd).text.toString()
+      val dataVersion = dialogView.findViewById<EditText>(R.id.dataVersionEd).text.toString()
+      val timedRequestTimeoutMs = dialogView.findViewById<EditText>(R.id.timedRequestTimeoutEd).text.toString()
+      val imTimeout = dialogView.findViewById<EditText>(R.id.imTimeoutEd).text.toString()
+      scope.launch {
+        write(  writeValueTypeSp.selectedItem.toString(),
+                writeValue,
+                if (dataVersion.isEmpty()) { null } else { dataVersion.toInt() },
+                if (timedRequestTimeoutMs.isEmpty()) { 0 } else { timedRequestTimeoutMs.toInt() },
+                if (imTimeout.isEmpty()) { 0 } else { imTimeout.toInt() } )
+        requireActivity().runOnUiThread { dialog.dismiss() }
+      }
+    }
+    dialog.show()
+  }
+
   private fun showSubscribeDialog(type: Int) {
     val dialogView = requireActivity().layoutInflater.inflate(R.layout.subscribe_dialog, null)
     val isUrgentTv = dialogView.findViewById<TextView>(R.id.titleisUrgent)
@@ -237,14 +363,79 @@ class WildcardFragment : Fragment() {
     dialog.show()
   }
 
+  private fun showInvokeDialog() {
+    binding.outputTv.text = ""
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.invoke_dialog, null)
+    val invokeValueEd = dialogView.findViewById<EditText>(R.id.invokeValueEd)
+    val dialog = AlertDialog.Builder(requireContext()).apply {
+      setView(dialogView)
+    }.create()
+
+    dialogView.findViewById<Button>(R.id.invokeBtn).setOnClickListener {
+      val invokeValue = invokeValueEd.text.toString()
+      val timedRequestTimeoutMs = dialogView.findViewById<EditText>(R.id.timedRequestTimeoutEd).text.toString()
+      val imTimeout = dialogView.findViewById<EditText>(R.id.imTimeoutEd).text.toString()
+      scope.launch {
+        invoke(invokeValue,
+                if (timedRequestTimeoutMs.isEmpty()) { 0 } else { timedRequestTimeoutMs.toInt() },
+                if (imTimeout.isEmpty()) { 0 } else { imTimeout.toInt() } )
+        requireActivity().runOnUiThread { dialog.dismiss() }
+      }
+    }
+    dialog.show()
+  }
+
   private fun getChipPathIdForText(text: String): ChipPathId {
     return if (text.isEmpty()) ChipPathId.forWildcard() else ChipPathId.forId(text.toLong())
   }
 
+  interface TlvWriterInterface {
+    fun generate(writer : TlvWriter, value: String, tag: chip.tlv.Tag = AnonymousTag)
+  }
+
   companion object {
     private const val TAG = "WildcardFragment"
     private const val ATTRIBUTE = 1
     private const val EVENT = 2
     fun newInstance(): WildcardFragment = WildcardFragment()
+
+    private val TLV_MAP = mapOf(
+            "UnsignedInt" to object:TlvWriterInterface {
+              override fun generate(writer : TlvWriter, value: String, tag: chip.tlv.Tag) {
+                writer.put(tag, value.toUInt())
+              }
+            },
+            "Int" to object:TlvWriterInterface {
+              override fun generate(writer : TlvWriter, value: String, tag: chip.tlv.Tag) {
+                writer.put(tag, value.toInt())
+              }
+            },
+            "Boolean" to object:TlvWriterInterface {
+              override fun generate(writer : TlvWriter, value: String, tag: chip.tlv.Tag) {
+                writer.put(tag, value.toBoolean())
+              }
+            },
+            "Float" to object:TlvWriterInterface {
+              override fun generate(writer : TlvWriter, value: String, tag: chip.tlv.Tag) {
+                writer.put(tag, value.toFloat())
+              }
+            },
+            "Double" to object:TlvWriterInterface {
+              override fun generate(writer : TlvWriter, value: String, tag: chip.tlv.Tag) {
+                writer.put(tag, value.toDouble())
+              }
+            },
+            "String" to object:TlvWriterInterface {
+              override fun generate(writer : TlvWriter, value: String, tag: chip.tlv.Tag) {
+                writer.put(tag, value)
+              }
+            },
+            "ByteArray(Hex)" to object:TlvWriterInterface {
+              override fun generate(writer : TlvWriter, value: String, tag: chip.tlv.Tag) {
+                val byteStringValue = ByteString.fromHex(value)
+                writer.put(tag, byteStringValue)
+              }
+            },
+    )
   }
 }
\ No newline at end of file
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/invoke_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/invoke_dialog.xml
new file mode 100644
index 00000000000000..5df531fb0faa79
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/invoke_dialog.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/invoke_dialog_title_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <EditText
+      android:id="@+id/invokeValueEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/invoke_dialog_write_value_hint"
+      android:inputType="text"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText" />
+
+  <EditText
+      android:id="@+id/timedRequestTimeoutEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/invoke_dialog_timed_request_timeout_hint"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/invokeValueEd" />
+
+  <EditText
+      android:id="@+id/imTimeoutEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/invoke_dialog_im_timeout_hint"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/timedRequestTimeoutEd"
+      app:layout_constraintBottom_toTopOf="@id/exampleHint"/>
+
+  <TextView
+      android:id="@+id/exampleHint"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/invoke_dialog_user_guide_hint"
+      android:textSize="10sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/imTimeoutEd"
+      app:layout_constraintBottom_toTopOf="@id/invokeBtn"
+      tools:ignore="SmallSp" />
+
+  <Button
+      android:id="@+id/invokeBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/invoke_dialog_write_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/wildcard_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/wildcard_fragment.xml
index d50e4b7d344b58..cf68b2c5aba2d6 100644
--- a/examples/android/CHIPTool/app/src/main/res/layout/wildcard_fragment.xml
+++ b/examples/android/CHIPTool/app/src/main/res/layout/wildcard_fragment.xml
@@ -20,7 +20,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginTop="8dp"
-      app:constraint_referenced_ids="endpointIdLabel,endpointIdEd,clusterIdLabel,clusterIdEd,attributeIdLabel,attributeIdEd,eventIdLabel,eventIdEd"
+      app:constraint_referenced_ids="endpointIdLabel,endpointIdEd,clusterIdLabel,clusterIdEd,attributeIdLabel,attributeIdEd,eventIdLabel,eventIdEd,commandIdLabel,commandIdEd"
       app:flow_horizontalBias="0.0"
       app:flow_horizontalGap="8dp"
       app:flow_horizontalStyle="packed"
@@ -92,6 +92,22 @@
       android:inputType="number"
       android:hint="@string/wildcard_help_label"/>
 
+  <TextView
+      android:id="@+id/commandIdLabel"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:padding="8dp"
+      android:textSize="16sp"
+      android:text="@string/command_id_label" />
+
+  <EditText
+      android:id="@+id/commandIdEd"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_margin="16dp"
+      android:inputType="number"
+      android:hint="@string/wildcard_help_label"/>
+
   <Button
       android:id="@+id/readBtn"
       android:layout_width="wrap_content"
@@ -103,6 +119,34 @@
       android:text="@string/wildcard_read_btn_text"
       android:textSize="16sp"
       app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintEnd_toStartOf="@id/writeBtn"
+      app:layout_constraintTop_toBottomOf="@id/flow"/>
+
+  <Button
+      android:id="@+id/writeBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:padding="16dp"
+      android:layout_marginTop="16dp"
+      android:layout_marginBottom="8dp"
+      android:layout_gravity="center"
+      android:text="@string/wildcard_write_btn_text"
+      android:textSize="16sp"
+      app:layout_constraintStart_toEndOf="@id/readBtn"
+      app:layout_constraintEnd_toStartOf="@id/invokeBtn"
+      app:layout_constraintTop_toBottomOf="@id/flow"/>
+
+  <Button
+      android:id="@+id/invokeBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:padding="16dp"
+      android:layout_marginTop="16dp"
+      android:layout_marginBottom="8dp"
+      android:layout_gravity="center"
+      android:text="@string/wildcard_invoke_btn_text"
+      android:textSize="16sp"
+      app:layout_constraintStart_toEndOf="@id/writeBtn"
       app:layout_constraintEnd_toStartOf="@id/subscribeBtn"
       app:layout_constraintTop_toBottomOf="@id/flow"/>
 
@@ -116,7 +160,7 @@
       android:layout_gravity="center"
       android:text="@string/wildcard_subscribe_btn_text"
       android:textSize="16sp"
-      app:layout_constraintStart_toEndOf="@id/readBtn"
+      app:layout_constraintStart_toEndOf="@id/invokeBtn"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toBottomOf="@id/flow"/>
 
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/write_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/write_dialog.xml
new file mode 100644
index 00000000000000..030d1cfd213a92
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/write_dialog.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/write_dialog_title_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <TextView
+      android:id="@+id/titleValueTypeTv"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/write_dialog_value_type_hint"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText" />
+
+  <Spinner
+      android:id="@+id/writeValueTypeSp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/write_dialog_value_type_hint"
+      android:inputType="text"
+      android:spinnerMode="dropdown"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleValueTypeTv" />
+
+  <EditText
+      android:id="@+id/writeValueEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/write_dialog_write_value_hint"
+      android:inputType="text"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/writeValueTypeSp" />
+
+  <EditText
+      android:id="@+id/dataVersionEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/write_dialog_data_version_hint"
+      android:inputType="text"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/writeValueEd" />
+
+  <EditText
+      android:id="@+id/timedRequestTimeoutEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/write_dialog_timed_request_timeout_hint"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/dataVersionEd" />
+
+  <EditText
+      android:id="@+id/imTimeoutEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/write_dialog_im_timeout_hint"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/timedRequestTimeoutEd"
+      app:layout_constraintBottom_toTopOf="@id/exampleHint"/>
+  <TextView
+      android:id="@+id/exampleHint"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/write_dialog_user_guide_hint"
+      android:textSize="10sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/imTimeoutEd"
+      app:layout_constraintBottom_toTopOf="@id/writeBtn"/>
+
+  <Button
+      android:id="@+id/writeBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/write_dialog_write_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/values/strings.xml b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
index ff7a7753da2de4..7ca572677b391d 100644
--- a/examples/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -146,13 +146,33 @@
     <string name="subscribe_dialog_keep_subscriptions_hint">keep subscriptions (bool)</string>
     <string name="subscribe_dialog_is_fabric_filtered_hint">is Fabric Filtered (bool)</string>
 
+    <string name="write_dialog_title_text">Write</string>
+    <string name="write_dialog_write_btn_text">Write</string>
+    <string name="write_dialog_value_type_hint">Write Value Type</string>
+    <string name="write_dialog_write_value_hint">Write Value</string>
+    <string name="write_dialog_data_version_hint">Data Version (Optional)</string>
+    <string name="write_dialog_timed_request_timeout_hint">Timed Request Timeout</string>
+    <string name="write_dialog_im_timeout_hint">Timeout</string>
+    <string name="write_dialog_user_guide_hint">Example:\nIdentifyCluster, IdentifyTime - Type : UInt\nBasicInformationCluster, UserLabel - Type : String\nIf you want to enter an array, separate the value by \',\'.(abc,def)</string>
+
+    <string name="invoke_dialog_title_text">Invoke</string>
+    <string name="invoke_dialog_write_btn_text">Invoke</string>
+    <string name="invoke_dialog_value_type_hint">Invoke Value Type</string>
+    <string name="invoke_dialog_write_value_hint">Invoke Value</string>
+    <string name="invoke_dialog_timed_request_timeout_hint">Timed Request Timeout</string>
+    <string name="invoke_dialog_im_timeout_hint">Timeout</string>
+    <string name="invoke_dialog_user_guide_hint">Usage : [Type]:[Value],[Type]:[Value]\nType:UnsignedInt, Int, Boolean, Float, Double, String, ByteArray(Hex)\nExample:\nLevelControlCluster, moveToLevel : UnsignedInt:100,UnsignedInt:0</string>
+
     <string name="endpoint_id_label">Endpoint ID</string>
     <string name="cluster_id_label">Cluster ID</string>
     <string name="attribute_id_label">Attribute ID</string>
     <string name="event_id_label">Event ID</string>
+    <string name="command_id_label">Command ID</string>
     <string name="wildcard_help_label">Leave blank for wildcard</string>
     <string name="wildcard_subscribe_btn_text">Subscribe</string>
     <string name="wildcard_read_btn_text">Read</string>
+    <string name="wildcard_invoke_btn_text">Invoke</string>
+    <string name="wildcard_write_btn_text">Write</string>
     <string name="wildcard_subscribe_event_btn_text">Subscribe Event</string>
     <string name="wildcard_read_event_btn_text">Read Event</string>
 
diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp
index 09581bcbffbec8..f79f80f8bd5c8a 100644
--- a/examples/bridge-app/esp32/main/main.cpp
+++ b/examples/bridge-app/esp32/main/main.cpp
@@ -32,6 +32,7 @@
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/ZclString.h>
+#include <platform/ESP32/ESP32Utils.h>
 
 #include <app/InteractionModelEngine.h>
 #include <app/server/Server.h>
@@ -403,6 +404,12 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
         return;
     }
+    err = esp_event_loop_create_default();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "esp_event_loop_create_default()  failed: %s", esp_err_to_name(err));
+        return;
+    }
 
     CHIP_ERROR chip_err = CHIP_NO_ERROR;
 
@@ -410,6 +417,14 @@ extern "C" void app_main()
     // Clear database
     memset(gDevices, 0, sizeof(gDevices));
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (DeviceLayer::Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize the Wi-Fi stack");
+        return;
+    }
+#endif
+
     gLight1.SetReachable(true);
     gLight2.SetReachable(true);
     gLight3.SetReachable(true);
diff --git a/examples/chef/esp32/main/main.cpp b/examples/chef/esp32/main/main.cpp
index dd10c597c5f5c1..e22b3e4cc279c2 100644
--- a/examples/chef/esp32/main/main.cpp
+++ b/examples/chef/esp32/main/main.cpp
@@ -35,6 +35,7 @@
 
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <platform/ESP32/ESP32Utils.h>
 #include <platform/ESP32/NetworkCommissioningDriver.h>
 
 #include <app-common/zap-generated/att-storage.h>
@@ -177,7 +178,15 @@ void InitServer(intptr_t)
 extern "C" void app_main(void)
 {
     ESP_ERROR_CHECK(nvs_flash_init());
+    ESP_ERROR_CHECK(esp_event_loop_create_default());
     chip::Platform::MemoryInit();
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (DeviceLayer::Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize the Wi-Fi stack");
+        return;
+    }
+#endif
     chip::DeviceLayer::PlatformMgr().InitChipStack();
     chip::DeviceLayer::PlatformMgr().StartEventLoopTask();
 
diff --git a/examples/chip-tool/commands/clusters/ComplexArgument.h b/examples/chip-tool/commands/clusters/ComplexArgument.h
index 37a219325d66f2..7705ba50369a59 100644
--- a/examples/chip-tool/commands/clusters/ComplexArgument.h
+++ b/examples/chip-tool/commands/clusters/ComplexArgument.h
@@ -45,7 +45,7 @@
 
 #include "JsonParser.h"
 
-constexpr uint8_t kMaxLabelLength  = 100;
+constexpr uint8_t kMaxLabelLength  = UINT8_MAX;
 constexpr const char kNullString[] = "null";
 
 class ComplexArgumentParser
@@ -168,12 +168,19 @@ class ComplexArgumentParser
         }
 
         auto content = static_cast<typename std::remove_const<T>::type *>(chip::Platform::MemoryCalloc(value.size(), sizeof(T)));
+        VerifyOrReturnError(content != nullptr, CHIP_ERROR_NO_MEMORY);
 
         Json::ArrayIndex size = value.size();
         for (Json::ArrayIndex i = 0; i < size; i++)
         {
             char labelWithIndex[kMaxLabelLength];
-            snprintf(labelWithIndex, sizeof(labelWithIndex), "%s[%d]", label, i);
+            // GCC 7.0.1 has introduced some new warnings for snprintf (-Werror=format-truncation) by default.
+            // This is not particularly useful when using snprintf and especially in this context, so in order
+            // to disable the warning the %s is constrained to be of max length: (254 - 11 - 2) where:
+            //  - 254 is kMaxLabelLength - 1 (for null)
+            //  - 11 is the maximum length of a %d (-2147483648, 2147483647)
+            //  - 2 is the length for the "[" and "]" characters.
+            snprintf(labelWithIndex, sizeof(labelWithIndex), "%.241s[%d]", label, i);
             ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithIndex, content[i], value[i]));
         }
 
@@ -200,6 +207,8 @@ class ComplexArgumentParser
             size = str.size();
 
             buffer = static_cast<uint8_t *>(chip::Platform::MemoryCalloc(size, sizeof(uint8_t)));
+            VerifyOrReturnError(buffer != nullptr, CHIP_ERROR_NO_MEMORY);
+
             memcpy(buffer, str.c_str(), size);
         }
         else
@@ -244,6 +253,8 @@ class ComplexArgumentParser
 
         size_t size = strlen(value.asCString());
         auto buffer = static_cast<char *>(chip::Platform::MemoryCalloc(size, sizeof(char)));
+        VerifyOrReturnError(buffer != nullptr, CHIP_ERROR_NO_MEMORY);
+
         memcpy(buffer, value.asCString(), size);
 
         request = chip::CharSpan(buffer, size);
diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
index 0a1f1957a6df52..fc895d4eb69eb1 100644
--- a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
+++ b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
@@ -132,6 +132,10 @@ struct InteractiveServerResult
         case chip::Logging::kLogCategory_Detail:
             messageType = kCategoryDetail;
             break;
+        default:
+            // This should not happen.
+            chipDie();
+            break;
         }
 
         mLogs.push_back(InteractiveServerResultLog({ module, base64Message, messageType }));
diff --git a/examples/common/screen-framework/Display.cpp b/examples/common/screen-framework/Display.cpp
index bd6e363b33c9ac..71e41f10aaa36e 100644
--- a/examples/common/screen-framework/Display.cpp
+++ b/examples/common/screen-framework/Display.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020-2023 Project CHIP Authors
  *    Copyright (c) 2018 Nest Labs, Inc.
  *    All rights reserved.
  *
@@ -16,14 +16,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-/**
- * @file Display.cpp
- *
- * This file implements helper APIs for the M5Stack's display
- *
- */
-
 #include <string.h>
 
 #include "driver/ledc.h"
@@ -54,7 +46,7 @@
 // The M5Stack's backlight is on Channel 7
 #define BACKLIGHT_CHANNEL LEDC_CHANNEL_7
 
-extern const char * TAG;
+static const char * TAG = "Display";
 
 uint16_t DisplayHeight = 0;
 uint16_t DisplayWidth  = 0;
diff --git a/examples/java-matter-controller/BUILD.gn b/examples/java-matter-controller/BUILD.gn
index 83aea5b0e000ff..7724d5fcd80516 100644
--- a/examples/java-matter-controller/BUILD.gn
+++ b/examples/java-matter-controller/BUILD.gn
@@ -27,38 +27,8 @@ java_library("java") {
   ]
 
   sources = [
-    "java/src/com/matter/controller/commands/common/Argument.java",
-    "java/src/com/matter/controller/commands/common/ArgumentType.java",
-    "java/src/com/matter/controller/commands/common/Command.java",
-    "java/src/com/matter/controller/commands/common/CommandManager.java",
-    "java/src/com/matter/controller/commands/common/CredentialsIssuer.java",
     "java/src/com/matter/controller/commands/common/FutureResult.java",
-    "java/src/com/matter/controller/commands/common/IPAddress.java",
-    "java/src/com/matter/controller/commands/common/MatterCommand.java",
     "java/src/com/matter/controller/commands/common/RealResult.java",
-    "java/src/com/matter/controller/commands/pairing/CloseSessionCommand.java",
-    "java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.java",
-    "java/src/com/matter/controller/commands/pairing/PairAddressPaseCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairAlreadyDiscoveredCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairCodeCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairCodePaseCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissionerCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissioningModeCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkDeviceTypeCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkFabricCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairingCommand.java",
-    "java/src/com/matter/controller/commands/pairing/PairingModeType.java",
-    "java/src/com/matter/controller/commands/pairing/PairingNetworkType.java",
-    "java/src/com/matter/controller/commands/pairing/UnpairCommand.java",
   ]
 
   javac_flags = [ "-Xlint:deprecation" ]
@@ -73,9 +43,39 @@ kotlin_binary("java-matter-controller") {
 
   sources = [
     "java/src/com/matter/controller/Main.kt",
+    "java/src/com/matter/controller/commands/common/Argument.kt",
+    "java/src/com/matter/controller/commands/common/ArgumentType.kt",
+    "java/src/com/matter/controller/commands/common/Command.kt",
+    "java/src/com/matter/controller/commands/common/CommandManager.kt",
+    "java/src/com/matter/controller/commands/common/CredentialsIssuer.kt",
+    "java/src/com/matter/controller/commands/common/IPAddress.kt",
+    "java/src/com/matter/controller/commands/common/MatterCommand.kt",
     "java/src/com/matter/controller/commands/discover/DiscoverCommand.kt",
     "java/src/com/matter/controller/commands/discover/DiscoverCommissionablesCommand.kt",
     "java/src/com/matter/controller/commands/discover/DiscoverCommissionersCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/CloseSessionCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.kt",
+    "java/src/com/matter/controller/commands/pairing/PairAddressPaseCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairAlreadyDiscoveredCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairCodePaseCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissionerCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissioningModeCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkDeviceTypeCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkFabricCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairingCommand.kt",
+    "java/src/com/matter/controller/commands/pairing/PairingModeType.kt",
+    "java/src/com/matter/controller/commands/pairing/PairingNetworkType.kt",
+    "java/src/com/matter/controller/commands/pairing/UnpairCommand.kt",
   ]
 
   kotlinc_flags = [ "-Xlint:deprecation" ]
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/Main.kt b/examples/java-matter-controller/java/src/com/matter/controller/Main.kt
index 49cbea1ae65794..3aad410c3ddbf1 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/Main.kt
+++ b/examples/java-matter-controller/java/src/com/matter/controller/Main.kt
@@ -81,11 +81,13 @@ fun main(args: Array<String>) {
   commandManager.register("discover", getDiscoveryCommands(controller, credentialsIssuer))
   commandManager.register("pairing", getPairingCommands(controller, credentialsIssuer))
   commandManager.register("im", getImCommands(controller, credentialsIssuer))
+
   try {
     commandManager.run(args)
   } catch (e: Exception) {
     println("Run command failed with exception: " + e.message)
     System.exit(1)
   }
+
   controller.shutdownCommissioning()
 }
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.java
deleted file mode 100644
index 746ae78f4d3dfe..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *   Copyright (c) 2022 Project CHIP Authors
- *   All rights reserved.
- *
- *   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.
- *
- */
-
-package com.matter.controller.commands.common;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nullable;
-
-public final class Argument {
-  private final String mName;
-  private final ArgumentType mType;
-  private final long mMin;
-  private final long mMax;
-  private final Object mValue;
-  private final Optional<String> mDesc;
-  private final boolean mOptional;
-
-  boolean isOptional() {
-    return mOptional;
-  }
-
-  public Argument(String name, IPAddress value, boolean optional) {
-    this.mName = name;
-    this.mType = ArgumentType.ADDRESS;
-    this.mMin = 0;
-    this.mMax = 0;
-    this.mValue = value;
-    this.mDesc = Optional.empty();
-    this.mOptional = optional;
-  }
-
-  public Argument(String name, StringBuffer value, @Nullable String desc, boolean optional) {
-    this.mName = name;
-    this.mType = ArgumentType.STRING;
-    this.mMin = 0;
-    this.mMax = 0;
-    this.mValue = value;
-    this.mDesc = Optional.ofNullable(desc);
-    this.mOptional = optional;
-  }
-
-  public Argument(String name, AtomicBoolean value, @Nullable String desc, boolean optional) {
-    this.mName = name;
-    this.mType = ArgumentType.BOOL;
-    this.mMin = 0;
-    this.mMax = 0;
-    this.mValue = value;
-    this.mDesc = Optional.ofNullable(desc);
-    this.mOptional = optional;
-  }
-
-  public Argument(
-      String name,
-      short min,
-      short max,
-      AtomicInteger value,
-      @Nullable String desc,
-      boolean optional) {
-    this.mName = name;
-    this.mType = ArgumentType.NUMBER_INT16;
-    this.mMin = min;
-    this.mMax = max;
-    this.mValue = value;
-    this.mDesc = Optional.ofNullable(desc);
-    this.mOptional = optional;
-  }
-
-  public Argument(
-      String name, int min, int max, AtomicInteger value, @Nullable String desc, boolean optional) {
-    this.mName = name;
-    this.mType = ArgumentType.NUMBER_INT32;
-    this.mMin = min;
-    this.mMax = max;
-    this.mValue = value;
-    this.mDesc = Optional.ofNullable(desc);
-    this.mOptional = optional;
-  }
-
-  public Argument(
-      String name, long min, long max, AtomicLong value, @Nullable String desc, boolean optional) {
-    this.mName = name;
-    this.mType = ArgumentType.NUMBER_INT64;
-    this.mMin = min;
-    this.mMax = max;
-    this.mValue = value;
-    this.mDesc = Optional.ofNullable(desc);
-    this.mOptional = optional;
-  }
-
-  public String getName() {
-    return mName;
-  }
-
-  public ArgumentType getType() {
-    return mType;
-  }
-
-  public Object getValue() {
-    return mValue;
-  }
-
-  public Optional<String> getDesc() {
-    return mDesc;
-  }
-
-  public void setValue(String value) {
-    boolean isValidArgument = false;
-
-    switch (mType) {
-      case ATTRIBUTE:
-        String str = (String) mValue;
-        isValidArgument = value.equals(str);
-        break;
-      case NUMBER_INT16:
-        AtomicInteger numShort = (AtomicInteger) mValue;
-        numShort.set(Integer.parseInt(value));
-        isValidArgument = (numShort.intValue() >= mMin && numShort.intValue() <= mMax);
-        break;
-      case NUMBER_INT32:
-        AtomicInteger num = (AtomicInteger) mValue;
-        num.set(Integer.parseInt(value));
-        isValidArgument = (num.intValue() >= mMin && num.intValue() <= mMax);
-        break;
-      case NUMBER_INT64:
-        AtomicLong numLong = (AtomicLong) mValue;
-        numLong.set(Long.parseLong(value));
-        isValidArgument = (numLong.intValue() >= mMin && numLong.intValue() <= mMax);
-        break;
-      case ADDRESS:
-        try {
-          IPAddress ipAddress = (IPAddress) mValue;
-          ipAddress.setAddress(InetAddress.getByName(value));
-          isValidArgument = true;
-        } catch (UnknownHostException e) {
-          isValidArgument = false;
-        }
-        break;
-    }
-
-    if (!isValidArgument) {
-      throw new IllegalArgumentException("Invalid argument " + mName + ": " + value);
-    }
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt
new file mode 100644
index 00000000000000..76e633a82a144a
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt
@@ -0,0 +1,157 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import java.net.InetAddress
+import java.net.UnknownHostException
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicLong
+
+class Argument {
+  val name: String
+  val type: ArgumentType
+  private val minValue: Long
+  private val maxValue: Long
+  val value: Any
+  val desc: String?
+  val isOptional: Boolean
+
+  constructor(name: String, value: IPAddress, optional: Boolean) {
+    this.name = name
+    type = ArgumentType.ADDRESS
+    minValue = 0
+    maxValue = 0
+    this.value = value
+    desc = null
+    isOptional = optional
+  }
+
+  constructor(name: String, value: StringBuffer, desc: String?, optional: Boolean) {
+    this.name = name
+    type = ArgumentType.STRING
+    minValue = 0
+    maxValue = 0
+    this.value = value
+    this.desc = desc
+    isOptional = optional
+  }
+
+  constructor(name: String, value: AtomicBoolean, desc: String?, optional: Boolean) {
+    this.name = name
+    type = ArgumentType.BOOL
+    minValue = 0
+    maxValue = 0
+    this.value = value
+    this.desc = desc
+    isOptional = optional
+  }
+
+  constructor(
+    name: String,
+    min: Short,
+    max: Short,
+    value: AtomicInteger,
+    desc: String?,
+    optional: Boolean
+  ) {
+    this.name = name
+    type = ArgumentType.NUMBER_INT16
+    minValue = min.toLong()
+    maxValue = max.toLong()
+    this.value = value
+    this.desc = desc
+    isOptional = optional
+  }
+
+  constructor(
+    name: String, min: Int, max: Int, value: AtomicInteger, desc: String?, optional: Boolean
+  ) {
+    this.name = name
+    type = ArgumentType.NUMBER_INT32
+    minValue = min.toLong()
+    maxValue = max.toLong()
+    this.value = value
+    this.desc = desc
+    isOptional = optional
+  }
+
+  constructor(
+    name: String, min: Short, max: Short, value: AtomicLong, desc: String?, optional: Boolean
+  ) {
+    this.name = name
+    type = ArgumentType.NUMBER_INT32
+    minValue = min.toLong()
+    maxValue = max.toLong()
+    this.value = value
+    this.desc = desc
+    isOptional = optional
+  }
+
+  constructor(
+    name: String, min: Long, max: Long, value: AtomicLong, desc: String?, optional: Boolean
+  ) {
+    this.name = name
+    type = ArgumentType.NUMBER_INT64
+    minValue = min
+    maxValue = max
+    this.value = value
+    this.desc = desc
+    isOptional = optional
+  }
+
+  fun setValue(value: String) {
+    var isValidArgument = false
+    when (type) {
+      ArgumentType.ATTRIBUTE -> {
+        val str = this.value as String
+        isValidArgument = value == str
+      }
+
+      ArgumentType.NUMBER_INT16 -> {
+        val numShort = this.value as AtomicInteger
+        numShort.set(value.toInt())
+        isValidArgument = numShort.toInt() >= minValue && numShort.toInt() <= maxValue
+      }
+
+      ArgumentType.NUMBER_INT32 -> {
+        val num = this.value as AtomicInteger
+        num.set(value.toInt())
+        isValidArgument = num.toInt() >= minValue && num.toInt() <= maxValue
+      }
+
+      ArgumentType.NUMBER_INT64 -> {
+        val numLong = this.value as AtomicLong
+        numLong.set(value.toLong())
+        isValidArgument = numLong.toInt() >= minValue && numLong.toInt() <= maxValue
+      }
+
+      ArgumentType.ADDRESS -> isValidArgument = try {
+        val ipAddress = this.value as IPAddress
+        ipAddress.setAddress(InetAddress.getByName(value))
+        true
+      } catch (e: UnknownHostException) {
+        false
+      }
+
+      else -> {
+      }
+    }
+    require(isValidArgument) { "Invalid argument " + name + ": " + value }
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.kt
similarity index 85%
rename from examples/java-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.java
rename to examples/java-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.kt
index e3ecccc923d1dc..900465c98eb61b 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.java
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.kt
@@ -1,5 +1,5 @@
 /*
- *   Copyright (c) 2022 Project CHIP Authors
+ *   Copyright (c) 2023 Project CHIP Authors
  *   All rights reserved.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,9 @@
  *   limitations under the License.
  *
  */
+package com.matter.controller.commands.common
 
-package com.matter.controller.commands.common;
-
-public enum ArgumentType {
+enum class ArgumentType {
   NUMBER_INT8,
   NUMBER_INT16,
   NUMBER_INT32,
@@ -36,5 +35,5 @@ public enum ArgumentType {
   VECTOR_BOOL,
   VECTOR16,
   VECTOR32,
-  VECTOR_CUSTOM,
-}
+  VECTOR_CUSTOM
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Command.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Command.java
deleted file mode 100644
index fe33e2459c2c31..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Command.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- *   Copyright (c) 2022 Project CHIP Authors
- *   All rights reserved.
- *
- *   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.
- *
- */
-
-package com.matter.controller.commands.common;
-
-import java.util.ArrayList;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.Nullable;
-
-/**
- * @brief Matter Controller command
- * @details The base class of all the commands the Matter Controller supports, which are actions
- *     that may be performed. Commands are verb-like, such as pair a Matter device or discover
- *     Matter devices from the environment.
- */
-public abstract class Command {
-  private static final String OPTIONAL_ARGUMENT_PREFIX = "--";
-  private static final int OPTIONAL_ARGUMENT_PREFIX_LENGTH = 2;
-  private final String mName;
-  private final ArrayList<Argument> mArgs = new ArrayList<Argument>();
-  private final Optional<String> mHelpText;
-
-  public Command(String commandName) {
-    this.mName = commandName;
-    this.mHelpText = Optional.empty();
-  }
-
-  public Command(String commandName, @Nullable String helpText) {
-    this.mName = commandName;
-    this.mHelpText = Optional.ofNullable(helpText);
-  }
-
-  public final String getName() {
-    return mName;
-  }
-
-  public final Optional<String> getHelpText() {
-    return mHelpText;
-  }
-
-  /**
-   * @brief Get attribute argument if it exists, there is at most one Attribute argument per command
-   * @return A pointer to an Optional where the Attribute argument will be stored
-   */
-  public final Optional<String> getAttribute() {
-    return mArgs
-        .stream()
-        .filter(arg -> arg.getType() == ArgumentType.ATTRIBUTE)
-        .findFirst()
-        .map(arg -> (String) arg.getValue());
-  }
-
-  public final String getArgumentName(int index) {
-    return mArgs.get(index).getName();
-  }
-
-  public final int getArgumentsCount() {
-    return mArgs.size();
-  }
-
-  public final boolean getArgumentIsOptional(int index) {
-    return mArgs.get(index).isOptional();
-  }
-
-  /**
-   * @brief Get argument description if it exists
-   * @return A pointer to an Optional where the argument description will be stored
-   */
-  public final Optional<String> getArgumentDescription(int index) {
-    return mArgs.get(index).getDesc();
-  }
-
-  public final void addArgumentToList(Argument arg, boolean optional) {
-    if (arg.isOptional() || mArgs.isEmpty()) {
-      // Safe to just append to the end of a list.
-      mArgs.add(arg);
-      return;
-    }
-
-    // mandatory arg needs to be inserted before the optional arguments.
-    int index = 0;
-    while (index < mArgs.size() && !mArgs.get(index).isOptional()) {
-      index++;
-    }
-
-    // Insert before the first optional arg.
-    mArgs.add(index, arg);
-  }
-
-  /**
-   * @brief Add a bool command argument
-   * @param name The name that will be displayed in the command help
-   * @param out A pointer to a MutableInteger where the argv value will be stored
-   * @param desc The description of the argument that will be displayed in the command help
-   * @param optional Indicate if an optional argument
-   * @return The number of arguments currently added to the command
-   */
-  public final void addArgument(
-      String name, AtomicBoolean out, @Nullable String desc, boolean optional) {
-    Argument arg = new Argument(name, out, desc, optional);
-    addArgumentToList(arg, optional);
-  }
-
-  /**
-   * @brief Add a short command argument
-   * @param name The name that will be displayed in the command help
-   * @param min The minimum value of the argv value
-   * @param max The minimum value of the argv value
-   * @param out A pointer to a MutableInteger where the argv value will be stored
-   * @param desc The description of the argument that will be displayed in the command help
-   * @param optional Indicate if an optional argument
-   * @return The number of arguments currently added to the command
-   */
-  public final void addArgument(
-      String name,
-      short min,
-      short max,
-      AtomicInteger out,
-      @Nullable String desc,
-      boolean optional) {
-    Argument arg = new Argument(name, min, max, out, desc, optional);
-    addArgumentToList(arg, optional);
-  }
-
-  /**
-   * @brief Add an int command argument
-   * @param name The name that will be displayed in the command help
-   * @param min The minimum value of the argv value
-   * @param max The minimum value of the argv value
-   * @param out A pointer to a MutableInteger where the argv value will be stored
-   * @param desc The description of the argument that will be displayed in the command help
-   * @param optional Indicate if an optional argument
-   * @return The number of arguments currently added to the command
-   */
-  public final void addArgument(
-      String name, int min, int max, AtomicInteger out, @Nullable String desc, boolean optional) {
-    Argument arg = new Argument(name, min, max, out, desc, optional);
-    addArgumentToList(arg, optional);
-  }
-
-  /**
-   * @brief Add a long Integer command argument
-   * @param name The name that will be displayed in the command help
-   * @param min The minimum value of the argv value
-   * @param max The minimum value of the argv value
-   * @param out A pointer to a MutableInteger where the argv value will be stored
-   * @param desc The description of the argument that will be displayed in the command help
-   * @param optional Indicate if an optional argument
-   * @return The number of arguments currently added to the command
-   */
-  public final void addArgument(
-      String name, long min, long max, AtomicLong out, @Nullable String desc, boolean optional) {
-    Argument arg = new Argument(name, min, max, out, desc, optional);
-    addArgumentToList(arg, optional);
-  }
-
-  /**
-   * @brief Add an IP address command argument
-   * @param name The name that will be displayed in the command help
-   * @param out A pointer to a IPAddress where the argv value will be stored
-   * @param optional Indicate if an optional argument
-   * @return The number of arguments currently added to the command
-   */
-  public final void addArgument(String name, IPAddress out, boolean optional) {
-    Argument arg = new Argument(name, out, optional);
-    addArgumentToList(arg, optional);
-  }
-
-  /**
-   * @brief Add a String command argument
-   * @param name The name that will be displayed in the command help
-   * @param out A pointer to a StringBuffer where the argv value will be stored
-   * @param desc The description of the argument that will be displayed in the command help
-   * @param optional Indicate if an optional argument
-   * @return The number of arguments currently added to the command
-   */
-  public final void addArgument(
-      String name, StringBuffer out, @Nullable String desc, boolean optional) {
-    Argument arg = new Argument(name, out, desc, optional);
-    addArgumentToList(arg, optional);
-  }
-
-  /**
-   * @brief Initialize command arguments
-   * @param argc The number of arguments to a command (Does not include command itself)
-   * @param args Supplied command-line arguments as an array of String objects.
-   */
-  public final void initArguments(int argc, String[] args) {
-    int mandatoryArgsCount = 0;
-    int currentIndex = 0;
-
-    for (Argument arg : mArgs) {
-      if (!arg.isOptional()) {
-        mandatoryArgsCount++;
-      }
-    }
-
-    if (argc < mandatoryArgsCount) {
-      throw new IllegalArgumentException(
-          "initArguments: Wrong arguments number: " + argc + " instead of " + mandatoryArgsCount);
-    }
-
-    // Initialize mandatory arguments
-    for (int i = 0; i < mandatoryArgsCount; i++) {
-      initArgument(currentIndex++, args[i]);
-    }
-
-    // Initialize optional arguments
-    // Optional arguments expect a name and a value, so i is increased by 2 on every step.
-    for (int i = mandatoryArgsCount; i < argc; i += 2) {
-      // optional arguments starts with OPTIONAL_ARGUMENT_PREFIX
-      if (args[i].length() <= OPTIONAL_ARGUMENT_PREFIX_LENGTH
-          && !args[i].startsWith(OPTIONAL_ARGUMENT_PREFIX)) {
-        throw new IllegalArgumentException("initArguments: Invalid optional argument: " + args[i]);
-      }
-
-      if (args[i]
-          .substring(OPTIONAL_ARGUMENT_PREFIX_LENGTH)
-          .equals(mArgs.get(currentIndex).getName())) {
-        if (i + 1 >= argc) {
-          throw new IllegalArgumentException(
-              "initArguments: Optional argument " + args[i] + " missing value");
-        }
-
-        initArgument(currentIndex++, args[i + 1]);
-      }
-    }
-  }
-
-  public void initArgument(int argIndex, String argValue) {
-    mArgs.get(argIndex).setValue(argValue);
-  }
-
-  public abstract void run() throws Exception;
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Command.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Command.kt
new file mode 100644
index 00000000000000..1a0f8655a9c2bf
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Command.kt
@@ -0,0 +1,256 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import java.util.ArrayList
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicLong
+
+/**
+ * @brief Matter Controller command
+ * @details The base class of all the commands the Matter Controller supports, which are actions
+ * that may be performed. Commands are verb-like, such as pair a Matter device or discover
+ * Matter devices from the environment.
+ */
+abstract class Command(
+  private val name: String,
+  private val helpText: String? = null) {
+  private val arguments = ArrayList<Argument>()
+
+  fun getName(): String {
+    return name
+  }
+
+  fun getHelpText(): String? {
+    return helpText
+  }
+
+  fun getArgumentName(index: Int): String {
+    return arguments[index].name
+  }
+
+  fun getArgumentsCount(): Int {
+    return arguments.size
+  }
+
+  fun getArgumentIsOptional(index: Int): Boolean {
+    return arguments[index].isOptional
+  }
+
+  /**
+   * @brief Get attribute argument if it exists, there is at most one Attribute argument per command
+   * @return A pointer to an Optional where the Attribute argument will be stored
+   */
+  fun getAttribute(): String? {
+    return arguments.find { arg -> arg.type === ArgumentType.ATTRIBUTE }?.value as? String
+  }
+
+  /**
+   * @brief Get argument description if it exists
+   * @return A pointer to an Optional where the argument description will be stored
+   */
+  fun getArgumentDescription(index: Int): String? {
+    return arguments[index].desc
+  }
+
+  fun addArgumentToList(arg: Argument) {
+    if (arg.isOptional || arguments.isEmpty()) {
+      // Safe to just append to the end of a list.
+      arguments.add(arg)
+      return
+    }
+
+    // mandatory arg needs to be inserted before the optional arguments.
+    var index = 0
+    while (index < arguments.size && !arguments[index].isOptional) {
+      index++
+    }
+
+    // Insert before the first optional arg.
+    arguments.add(index, arg)
+  }
+
+  /**
+   * @brief Add a bool command argument
+   * @param name The name that will be displayed in the command help
+   * @param out A pointer to a AtomicBoolean where the argv value will be stored
+   * @param desc The description of the argument that will be displayed in the command help
+   * @param optional Indicate if an optional argument
+   * @return The number of arguments currently added to the command
+   */
+  fun addArgument(
+    name: String?, out: AtomicBoolean?, desc: String?, optional: Boolean
+  ) {
+    val arg = Argument(name!!, out!!, desc, optional)
+    addArgumentToList(arg)
+  }
+
+  /**
+   * @brief Add a short command argument
+   * @param name The name that will be displayed in the command help
+   * @param min The minimum value of the argv value
+   * @param max The minimum value of the argv value
+   * @param out A pointer to a AtomicInteger where the argv value will be stored
+   * @param desc The description of the argument that will be displayed in the command help
+   * @param optional Indicate if an optional argument
+   * @return The number of arguments currently added to the command
+   */
+  fun addArgument(
+    name: String?,
+    min: Short,
+    max: Short,
+    out: AtomicInteger?,
+    desc: String?,
+    optional: Boolean
+  ) {
+    val arg = Argument(name!!, min, max, out!!, desc, optional)
+    addArgumentToList(arg)
+  }
+
+  /**
+   * @brief Add an int command argument
+   * @param name The name that will be displayed in the command help
+   * @param min The minimum value of the argv value
+   * @param max The minimum value of the argv value
+   * @param out A pointer to a AtomicInteger where the argv value will be stored
+   * @param desc The description of the argument that will be displayed in the command help
+   * @param optional Indicate if an optional argument
+   * @return The number of arguments currently added to the command
+   */
+  fun addArgument(
+    name: String?, min: Int, max: Int, out: AtomicInteger?, desc: String?, optional: Boolean
+  ) {
+    val arg = Argument(name!!, min, max, out!!, desc, optional)
+    addArgumentToList(arg)
+  }
+
+  /**
+   * @brief Add a long Integer command argument
+   * @param name The name that will be displayed in the command help
+   * @param min The minimum value of the argv value
+   * @param max The minimum value of the argv value
+   * @param out A pointer to a MutableInteger where the argv value will be stored
+   * @param desc The description of the argument that will be displayed in the command help
+   * @param optional Indicate if an optional argument
+   * @return The number of arguments currently added to the command
+   */
+  fun addArgument(
+    name: String?, min: Short, max: Short, out: AtomicLong?, desc: String?, optional: Boolean
+  ) {
+    val arg = Argument(name!!, min, max, out!!, desc, optional)
+    addArgumentToList(arg)
+  }
+
+  /**
+   * @brief Add a long Integer command argument
+   * @param name The name that will be displayed in the command help
+   * @param min The minimum value of the argv value
+   * @param max The minimum value of the argv value
+   * @param out A pointer to a AtomicLong where the argv value will be stored
+   * @param desc The description of the argument that will be displayed in the command help
+   * @param optional Indicate if an optional argument
+   * @return The number of arguments currently added to the command
+   */
+  fun addArgument(
+    name: String?, min: Long, max: Long, out: AtomicLong?, desc: String?, optional: Boolean
+  ) {
+    val arg = Argument(name!!, min, max, out!!, desc, optional)
+    addArgumentToList(arg)
+  }
+
+  /**
+   * @brief Add an IP address command argument
+   * @param name The name that will be displayed in the command help
+   * @param out A pointer to a IPAddress where the argv value will be stored
+   * @param optional Indicate if an optional argument
+   * @return The number of arguments currently added to the command
+   */
+  fun addArgument(name: String?, out: IPAddress?, optional: Boolean) {
+    val arg = Argument(name!!, out!!, optional)
+    addArgumentToList(arg)
+  }
+
+  /**
+   * @brief Add a String command argument
+   * @param name The name that will be displayed in the command help
+   * @param out A pointer to a StringBuffer where the argv value will be stored
+   * @param desc The description of the argument that will be displayed in the command help
+   * @param optional Indicate if an optional argument
+   * @return The number of arguments currently added to the command
+   */
+  fun addArgument(
+    name: String?, out: StringBuffer?, desc: String?, optional: Boolean
+  ) {
+    val arg = Argument(name!!, out!!, desc, optional)
+    addArgumentToList(arg)
+  }
+
+  /**
+   * @brief Initialize command arguments
+   * @param args Supplied command-line arguments as an array of String objects.
+   */
+  fun initArguments(args: Array<String>) {
+    val argc = args.size
+    var mandatoryArgsCount = 0
+    var currentIndex = 0
+    for (arg in arguments) {
+      if (!arg.isOptional) {
+        mandatoryArgsCount++
+      }
+    }
+    require(argc >= mandatoryArgsCount) { "initArguments: Wrong arguments number: $argc instead of $mandatoryArgsCount" }
+
+    // Initialize mandatory arguments
+    for (i in 0 until mandatoryArgsCount) {
+      initArgument(currentIndex++, args[i])
+    }
+
+    // Initialize optional arguments
+    // Optional arguments expect a name and a value, so it is increased by 2 on every step.
+    var i = mandatoryArgsCount
+    while (i < argc) {
+
+      // optional arguments starts with OPTIONAL_ARGUMENT_PREFIX
+      require(
+        !(args[i].length <= OPTIONAL_ARGUMENT_PREFIX_LENGTH
+                && !args[i].startsWith(OPTIONAL_ARGUMENT_PREFIX))
+      ) { "initArguments: Invalid optional argument: " + args[i] }
+      if (args[i]
+          .substring(OPTIONAL_ARGUMENT_PREFIX_LENGTH)
+        == arguments[currentIndex].name
+      ) {
+        require(i + 1 < argc) { "initArguments: Optional argument " + args[i] + " missing value" }
+        initArgument(currentIndex++, args[i + 1])
+      }
+      i += 2
+    }
+  }
+
+  fun initArgument(argIndex: Int, argValue: String?) {
+    arguments[argIndex].setValue(argValue!!)
+  }
+
+  @Throws(Exception::class)
+  abstract fun run()
+
+  companion object {
+    private const val OPTIONAL_ARGUMENT_PREFIX = "--"
+    private const val OPTIONAL_ARGUMENT_PREFIX_LENGTH = 2
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.java
deleted file mode 100644
index 202c6763a2187e..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- *   Copyright (c) 2022 Project CHIP Authors
- *   All rights reserved.
- *
- *   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.
- *
- */
-
-package com.matter.controller.commands.common;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public final class CommandManager {
-  private final Map<String, List<Command>> mClusters = new HashMap<String, List<Command>>();
-  private static Logger logger = Logger.getLogger(CommandManager.class.getName());
-
-  public final void register(String clusterName, List<Command> commandsList) {
-    mClusters.put(clusterName, commandsList);
-  }
-
-  public final void run(String[] args) throws Exception {
-    Command command;
-
-    if (args.length < 1) {
-      logger.log(Level.INFO, "Missing cluster name");
-      showClusters();
-      return;
-    }
-
-    List<Command> commands = mClusters.get(args[0]);
-    if (commands == null) {
-      logger.log(Level.INFO, "Unknown cluster: " + args[0]);
-      showClusters();
-      return;
-    }
-
-    if (args.length < 2) {
-      logger.log(Level.INFO, "Missing command name");
-      showCluster(args[0], commands);
-      return;
-    }
-
-    if (!isGlobalCommand(args[0])) {
-      command = getCommand(commands, args[1]);
-      if (command == null) {
-        System.out.printf("Unknown command: %s", args[1]);
-        showCluster(args[0], commands);
-        throw new IllegalArgumentException();
-      }
-    } else if (isEventCommand(args[1])) {
-      if (args.length < 3) {
-        logger.log(Level.INFO, "Missing event name");
-        showClusterEvents(args[0], args[1], commands);
-        throw new IllegalArgumentException();
-      }
-
-      command = getGlobalCommand(commands, args[1], args[2]);
-      if (command == null) {
-        logger.log(Level.INFO, "Unknown event: " + args[2]);
-        showClusterEvents(args[0], args[1], commands);
-        throw new IllegalArgumentException();
-      }
-    } else {
-      if (args.length < 3) {
-        logger.log(Level.INFO, "Missing attribute name");
-        showClusterAttributes(args[0], args[1], commands);
-        throw new IllegalArgumentException();
-      }
-
-      command = getGlobalCommand(commands, args[1], args[2]);
-      if (command == null) {
-        logger.log(Level.INFO, "Unknown attribute: " + args[2]);
-        showClusterAttributes(args[0], args[1], commands);
-        throw new IllegalArgumentException();
-      }
-    }
-
-    // need skip over binary and command name and only get arguments
-    String[] temp = Arrays.copyOfRange(args, 2, args.length);
-
-    try {
-      command.initArguments(temp.length, temp);
-    } catch (IllegalArgumentException e) {
-      logger.log(Level.INFO, "Arguments init failed with exception: " + e.getMessage());
-      showCommand(args[0], command);
-      System.exit(1);
-    }
-
-    command.run();
-  }
-
-  private boolean isAttributeCommand(String commandName) {
-    return commandName.equals("read")
-        || commandName.equals("write")
-        || commandName.equals("subscribe");
-  }
-
-  private boolean isEventCommand(String commandName) {
-    return commandName.equals("read-event") || commandName.equals("subscribe-event");
-  }
-
-  private boolean isGlobalCommand(String commandName) {
-    return isAttributeCommand(commandName) || isEventCommand(commandName);
-  }
-
-  private Command getCommand(List<Command> commands, String commandName) {
-    for (Command command : commands) {
-      if (commandName.equals(command.getName())) {
-        return command;
-      }
-    }
-
-    return null;
-  }
-
-  private Command getGlobalCommand(
-      List<Command> commands, String commandName, String attributeName) {
-    for (Command command : commands) {
-      if (commandName.equals(command.getName()) && attributeName.equals(command.getAttribute())) {
-        return command;
-      }
-    }
-
-    return null;
-  }
-
-  private void showClusters() {
-    logger.log(Level.INFO, "Usage:");
-    logger.log(
-        Level.INFO, "  java-matter-controller cluster_name command_name [param1 param2 ...]");
-    logger.log(Level.INFO, "\n");
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-    logger.log(
-        Level.INFO,
-        "  | Clusters:                                                                           |");
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-
-    for (String key : mClusters.keySet()) {
-      System.out.printf("  | * %-82s|\n", key.toLowerCase());
-    }
-
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-  }
-
-  private void showCluster(String clusterName, List<Command> commands) {
-    logger.log(Level.INFO, "Usage:");
-    logger.log(
-        Level.INFO,
-        "  java-matter-controller " + clusterName + " command_name [param1 param2 ...]");
-    logger.log(Level.INFO, "\n");
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-    logger.log(
-        Level.INFO,
-        "  | Commands:                                                                           |");
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-    boolean readCommand = false;
-    boolean writeCommand = false;
-    boolean subscribeCommand = false;
-    boolean readEventCommand = false;
-    boolean subscribeEventCommand = false;
-
-    for (Command command : commands) {
-      boolean shouldPrint = true;
-      String cmdName = command.getName();
-      if (isGlobalCommand(cmdName)) {
-        if (cmdName.equals("read") && !readCommand) {
-          readCommand = true;
-        } else if (cmdName.equals("write") && !writeCommand) {
-          writeCommand = true;
-        } else if (cmdName.equals("subscribe") && !subscribeCommand) {
-          subscribeCommand = true;
-        } else if (cmdName.equals("read-event") && !readEventCommand) {
-          readEventCommand = true;
-        } else if (cmdName.equals("subscribe-event") && !subscribeEventCommand) {
-          subscribeEventCommand = true;
-        } else {
-          shouldPrint = false;
-        }
-      }
-
-      if (shouldPrint) {
-        System.out.printf("  | * %-82s|\n", cmdName);
-      }
-    }
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+\n");
-  }
-
-  private void showClusterAttributes(
-      String clusterName, String commandName, List<Command> commands) {
-    logger.log(Level.INFO, "Usage:");
-    System.out.printf(
-        "  java-matter-controller %s %s attribute-name [param1 param2 ...]\n",
-        clusterName, commandName);
-    logger.log(Level.INFO, "\n");
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-    logger.log(
-        Level.INFO,
-        "  | Attributes:                                                                         |");
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-    for (Command command : commands) {
-      if (commandName.equals(command.getName())) {
-        System.out.printf("  | * %-82s|\n", command.getAttribute().get());
-      }
-    }
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-  }
-
-  private void showClusterEvents(String clusterName, String commandName, List<Command> commands) {
-    logger.log(Level.INFO, "Usage:");
-    System.out.printf(
-        "  java-matter-controller %s %s event-name [param1 param2 ...]\n",
-        clusterName, commandName);
-    logger.log(Level.INFO, "\n");
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-    logger.log(
-        Level.INFO,
-        "  | Events:                                                                             |");
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-
-    for (Command command : commands) {
-      if (commandName.equals(command.getName())) {
-        System.out.printf("  | * %-82s|\n", command.getAttribute().get());
-      }
-    }
-    logger.log(
-        Level.INFO,
-        "  +-------------------------------------------------------------------------------------+");
-  }
-
-  private void showCommand(String clusterName, Command command) {
-    logger.log(Level.INFO, "Usage:");
-
-    String arguments = command.getName();
-    String description = "";
-
-    int argumentsCount = command.getArgumentsCount();
-    for (int i = 0; i < argumentsCount; i++) {
-      String arg = "";
-      boolean isOptional = command.getArgumentIsOptional(i);
-      if (isOptional) {
-        arg += "[--";
-      }
-      arg += command.getArgumentName(i);
-      if (isOptional) {
-        arg += "]";
-      }
-      arguments += " ";
-      arguments += arg;
-
-      Optional<String> argDescription = command.getArgumentDescription(i);
-      if (argDescription.isPresent()) {
-        description += "\n";
-        description += arg;
-        description += ":\n  ";
-        description += argDescription.get();
-        description += "\n";
-      }
-    }
-    System.out.format("  java-matter-controller %s %s\n", clusterName, arguments);
-
-    Optional<String> helpText = command.getHelpText();
-    if (helpText.isPresent()) {
-      System.out.format("\n%s\n", helpText.get());
-    }
-
-    if (!description.isEmpty()) {
-      logger.log(Level.INFO, description);
-    }
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.kt
new file mode 100644
index 00000000000000..f6fdf19aced744
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.kt
@@ -0,0 +1,310 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import java.util.Arrays
+import java.util.HashMap
+import java.util.logging.Level
+import java.util.logging.Logger
+import kotlin.collections.MutableMap
+
+class CommandManager {
+  private val clusters: MutableMap<String, List<Command>> = HashMap()
+  fun register(clusterName: String, commandsList: List<Command>) {
+    clusters[clusterName] = commandsList
+  }
+
+  @Throws(Exception::class)
+  fun run(args: Array<String>) {
+    val command: Command?
+    if (args.size < 1) {
+      logger.log(Level.INFO, "Missing cluster name")
+      showClusters()
+      return
+    }
+    val commands = clusters[args[0]]
+    if (commands == null) {
+      logger.log(Level.INFO, "Unknown cluster: " + args[0])
+      showClusters()
+      return
+    }
+    if (args.size < 2) {
+      logger.log(Level.INFO, "Missing command name")
+      showCluster(args[0], commands)
+      return
+    }
+    if (!isGlobalCommand(args[0])) {
+      command = getCommand(commands, args[1])
+      if (command == null) {
+        System.out.printf("Unknown command: %s", args[1])
+        showCluster(args[0], commands)
+        throw IllegalArgumentException()
+      }
+    } else if (isEventCommand(args[1])) {
+      if (args.size < 3) {
+        logger.log(Level.INFO, "Missing event name")
+        showClusterEvents(args[0], args[1], commands)
+        throw IllegalArgumentException()
+      }
+      command = getGlobalCommand(commands, args[1], args[2])
+      if (command == null) {
+        logger.log(Level.INFO, "Unknown event: " + args[2])
+        showClusterEvents(args[0], args[1], commands)
+        throw IllegalArgumentException()
+      }
+    } else {
+      if (args.size < 3) {
+        logger.log(Level.INFO, "Missing attribute name")
+        showClusterAttributes(args[0], args[1], commands)
+        throw IllegalArgumentException()
+      }
+      command = getGlobalCommand(commands, args[1], args[2])
+      if (command == null) {
+        logger.log(Level.INFO, "Unknown attribute: " + args[2])
+        showClusterAttributes(args[0], args[1], commands)
+        throw IllegalArgumentException()
+      }
+    }
+
+    // need skip over binary and command name and only get arguments
+    val temp = Arrays.copyOfRange(args, 2, args.size)
+    try {
+      command.initArguments(temp)
+    } catch (e: IllegalArgumentException) {
+      logger.log(Level.INFO, "Arguments init failed with exception: " + e.message)
+      showCommand(args[0], command)
+      System.exit(1)
+    }
+    command.run()
+  }
+
+  private fun isAttributeCommand(commandName: String): Boolean {
+    return commandName == "read" || commandName == "write" || commandName == "subscribe"
+  }
+
+  private fun isEventCommand(commandName: String): Boolean {
+    return commandName == "read-event" || commandName == "subscribe-event"
+  }
+
+  private fun isGlobalCommand(commandName: String): Boolean {
+    return isAttributeCommand(commandName) || isEventCommand(commandName)
+  }
+
+  private fun getCommand(commands: List<Command>, commandName: String): Command? {
+    for (command in commands) {
+      if (commandName == command.getName()) {
+        return command
+      }
+    }
+    return null
+  }
+
+  private fun getGlobalCommand(
+    commands: List<Command>, commandName: String, attributeName: String
+  ): Command? {
+    for (command in commands) {
+      if (commandName == command.getName() && attributeName == command.getAttribute()) {
+        return command
+      }
+    }
+    return null
+  }
+
+  private fun showClusters() {
+    logger.log(Level.INFO, "Usage:")
+    logger.log(
+      Level.INFO, "  java-matter-controller cluster_name command_name [param1 param2 ...]"
+    )
+    logger.log(Level.INFO, "\n")
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+    logger.log(
+      Level.INFO,
+      "  | Clusters:                                                                           |"
+    )
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+    for (key in clusters.keys) {
+      System.out.printf("  | * %-82s|\n", key)
+    }
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+  }
+
+  private fun showCluster(clusterName: String, commands: List<Command>) {
+    logger.log(Level.INFO, "Usage:")
+    logger.log(
+      Level.INFO,
+      "  java-matter-controller $clusterName command_name [param1 param2 ...]"
+    )
+    logger.log(Level.INFO, "\n")
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+    logger.log(
+      Level.INFO,
+      "  | Commands:                                                                           |"
+    )
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+    var readCommand = false
+    var writeCommand = false
+    var subscribeCommand = false
+    var readEventCommand = false
+    var subscribeEventCommand = false
+    for (command in commands) {
+      var shouldPrint = true
+      val cmdName = command.getName()
+      if (isGlobalCommand(cmdName)) {
+        if (cmdName == "read" && !readCommand) {
+          readCommand = true
+        } else if (cmdName == "write" && !writeCommand) {
+          writeCommand = true
+        } else if (cmdName == "subscribe" && !subscribeCommand) {
+          subscribeCommand = true
+        } else if (cmdName == "read-event" && !readEventCommand) {
+          readEventCommand = true
+        } else if (cmdName == "subscribe-event" && !subscribeEventCommand) {
+          subscribeEventCommand = true
+        } else {
+          shouldPrint = false
+        }
+      }
+      if (shouldPrint) {
+        System.out.printf("  | * %-82s|\n", cmdName)
+      }
+    }
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+\n"
+    )
+  }
+
+  private fun showClusterAttributes(
+    clusterName: String, commandName: String, commands: List<Command>
+  ) {
+    logger.log(Level.INFO, "Usage:")
+    System.out.printf(
+      "  java-matter-controller %s %s attribute-name [param1 param2 ...]\n",
+      clusterName, commandName
+    )
+    logger.log(Level.INFO, "\n")
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+    logger.log(
+      Level.INFO,
+      "  | Attributes:                                                                         |"
+    )
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+    for (command in commands) {
+      if (commandName == command.getName()) {
+        System.out.printf("  | * %-82s|\n", command.getAttribute())
+      }
+    }
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+  }
+
+  private fun showClusterEvents(
+    clusterName: String, commandName: String, commands: List<Command>
+  ) {
+    logger.log(Level.INFO, "Usage:")
+    System.out.printf(
+      "  java-matter-controller %s %s event-name [param1 param2 ...]\n",
+      clusterName, commandName
+    )
+    logger.log(Level.INFO, "\n")
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+    logger.log(
+      Level.INFO,
+      "  | Events:                                                                             |"
+    )
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+    for (command in commands) {
+      if (commandName == command.getName()) {
+        System.out.printf("  | * %-82s|\n", command.getAttribute())
+      }
+    }
+    logger.log(
+      Level.INFO,
+      "  +-------------------------------------------------------------------------------------+"
+    )
+  }
+
+  private fun showCommand(clusterName: String, command: Command) {
+    logger.log(Level.INFO, "Usage:")
+    var arguments: String? = command.getName()
+    var description = ""
+    val argumentsCount = command.getArgumentsCount()
+    for (i in 0 until argumentsCount) {
+      var arg = ""
+      val isOptional = command.getArgumentIsOptional(i)
+      if (isOptional) {
+        arg += "[--"
+      }
+      arg += command.getArgumentName(i)
+      if (isOptional) {
+        arg += "]"
+      }
+      arguments += " "
+      arguments += arg
+      val argDescription = command.getArgumentDescription(i)
+      if (argDescription != null) {
+        description += "\n"
+        description += arg
+        description += ":\n  "
+        description += argDescription
+        description += "\n"
+      }
+    }
+    System.out.format("  java-matter-controller %s %s\n", clusterName, arguments)
+    val helpText = command.getHelpText()
+    if (helpText != null) {
+      System.out.format("\n%s\n", helpText)
+    }
+    if (!description.isEmpty()) {
+      logger.log(Level.INFO, description)
+    }
+  }
+
+  companion object {
+    private val logger = Logger.getLogger(CommandManager::class.java.name)
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CredentialsIssuer.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CredentialsIssuer.kt
similarity index 78%
rename from examples/java-matter-controller/java/src/com/matter/controller/commands/common/CredentialsIssuer.java
rename to examples/java-matter-controller/java/src/com/matter/controller/commands/common/CredentialsIssuer.kt
index a77508ea35a1bf..85bc35dde1a674 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CredentialsIssuer.java
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CredentialsIssuer.kt
@@ -1,5 +1,5 @@
 /*
- *   Copyright (c) 2022 Project CHIP Authors
+ *   Copyright (c) 2023 Project CHIP Authors
  *   All rights reserved.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +15,11 @@
  *   limitations under the License.
  *
  */
-
-package com.matter.controller.commands.common;
+package com.matter.controller.commands.common
 
 /**
  * @brief Credentials Issuer for the Command
  * @details Contains all credential information of the issuer of the command, such as operational
- *     credentials for a given fabric, the DAC verifier of the commisioner, etc ..
+ * credentials for a given fabric, the DAC verifier of the commisioner, etc ..
  */
-public class CredentialsIssuer {}
+class CredentialsIssuer 
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/IPAddress.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/IPAddress.java
deleted file mode 100644
index d419db43f25686..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/IPAddress.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.matter.controller.commands.common;
-
-import java.net.InetAddress;
-
-public final class IPAddress {
-  private InetAddress address;
-
-  public IPAddress(InetAddress address) {
-    this.address = address;
-  }
-
-  public void setAddress(InetAddress address) {
-    this.address = address;
-  }
-
-  @Override
-  public String toString() {
-    return address.toString();
-  }
-
-  public String getHostAddress() {
-    return address.getHostAddress();
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/IPAddress.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/IPAddress.kt
new file mode 100644
index 00000000000000..938cf0ce893326
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/IPAddress.kt
@@ -0,0 +1,34 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import java.net.InetAddress
+
+class IPAddress(private var address: InetAddress) {
+  fun setAddress(address: InetAddress) {
+    this.address = address
+  }
+
+  fun getHostAddress(): String {
+    return address.hostAddress
+  }
+
+  override fun toString(): String {
+    return address.toString()
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.java
deleted file mode 100644
index 6af420375e2f8c..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *   Copyright (c) 2022 Project CHIP Authors
- *   All rights reserved.
- *
- *   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.
- *
- */
-
-package com.matter.controller.commands.common;
-
-import chip.devicecontroller.ChipDeviceController;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Logger;
-
-public abstract class MatterCommand extends Command {
-  private final ChipDeviceController mChipDeviceController;
-  private final Optional<CredentialsIssuer> mCredIssuerCmds;
-  private final StringBuffer mCommissionerName = new StringBuffer();
-  private final StringBuffer mPaaTrustStorePath = new StringBuffer();
-  private final StringBuffer mCDTrustStorePath = new StringBuffer();
-  private final AtomicLong mCommissionerNodeId = new AtomicLong();
-  private final AtomicBoolean mUseMaxSizedCerts = new AtomicBoolean();
-  private final AtomicBoolean mOnlyAllowTrustedCdKeys = new AtomicBoolean();
-  private FutureResult mFutureResult = new FutureResult();
-  private static Logger logger = Logger.getLogger(MatterCommand.class.getName());
-
-  public MatterCommand(
-      ChipDeviceController controller, String commandName, CredentialsIssuer credIssuerCmds) {
-    this(controller, commandName, credIssuerCmds, null);
-  }
-
-  public MatterCommand(
-      ChipDeviceController controller,
-      String commandName,
-      CredentialsIssuer credIssuerCmds,
-      String helpText) {
-    super(commandName, helpText);
-    this.mCredIssuerCmds = Optional.ofNullable(credIssuerCmds);
-    this.mChipDeviceController = controller;
-
-    addArgument(
-        "paa-trust-store-path",
-        mPaaTrustStorePath,
-        "Path to directory holding PAA certificate information.  Can be absolute or relative to the current working "
-            + "directory.",
-        true);
-    addArgument(
-        "cd-trust-store-path",
-        mCDTrustStorePath,
-        "Path to directory holding CD certificate information.  Can be absolute or relative to the current working "
-            + "directory.",
-        true);
-    addArgument(
-        "commissioner-name",
-        mCommissionerName,
-        "Name of fabric to use. Valid values are \"alpha\", \"beta\", \"gamma\", and integers greater than or equal to "
-            + "4.  The default if not specified is \"alpha\".",
-        true);
-    addArgument(
-        "commissioner-nodeid",
-        0,
-        Long.MAX_VALUE,
-        mCommissionerNodeId,
-        "The node id to use for java-matter-controller.  If not provided, kTestControllerNodeId (112233, 0x1B669) will be used.",
-        true);
-    addArgument(
-        "use-max-sized-certs",
-        mUseMaxSizedCerts,
-        "Maximize the size of operational certificates. If not provided or 0 (\"false\"), normally sized operational "
-            + "certificates are generated.",
-        true);
-    addArgument(
-        "only-allow-trusted-cd-keys",
-        mOnlyAllowTrustedCdKeys,
-        "Only allow trusted CD verifying keys (disallow test keys). If not provided or 0 (\"false\"), untrusted CD "
-            + "verifying keys are allowed. If 1 (\"true\"), test keys are disallowed.",
-        true);
-  }
-
-  // This method returns the commissioner instance to be used for running the command.
-  public ChipDeviceController currentCommissioner() {
-    return mChipDeviceController;
-  }
-
-  /////////// Command Interface /////////
-  @Override
-  public void run() throws Exception {
-    runCommand();
-  }
-
-  protected abstract void runCommand();
-
-  public final void setSuccess() {
-    mFutureResult.setRealResult(RealResult.Success());
-  }
-
-  public final void setFailure(String error) {
-    mFutureResult.setRealResult(RealResult.Error(error));
-  }
-
-  public final void waitCompleteMs(long timeoutMs) {
-    mFutureResult.setTimeoutMs(timeoutMs);
-    mFutureResult.waitResult();
-  }
-
-  public final void clear() {
-    mFutureResult.clear();
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.kt
new file mode 100644
index 00000000000000..208213beef6818
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.kt
@@ -0,0 +1,116 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.common
+
+import chip.devicecontroller.ChipDeviceController
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicLong
+import java.util.logging.Logger
+
+abstract class MatterCommand(
+  private val chipDeviceController: ChipDeviceController,
+  private val credIssuerCmds: CredentialsIssuer?,
+  commandName: String,
+  helpText: String? = null
+) : Command(commandName, helpText) {
+  private val commissionerName = StringBuffer()
+  private val paaTrustStorePath = StringBuffer()
+  private val cdTrustStorePath = StringBuffer()
+  private val commissionerNodeId: AtomicLong = AtomicLong()
+  private val useMaxSizedCerts: AtomicBoolean = AtomicBoolean()
+  private val onlyAllowTrustedCdKeys: AtomicBoolean = AtomicBoolean()
+  private val futureResult = FutureResult()
+
+  init {
+    addArgument(
+      "paa-trust-store-path",
+      paaTrustStorePath,
+      "Path to directory holding PAA certificate information.  Can be absolute or relative to the current working "
+              + "directory.",
+      true
+    )
+    addArgument(
+      "cd-trust-store-path",
+      cdTrustStorePath,
+      "Path to directory holding CD certificate information.  Can be absolute or relative to the current working "
+              + "directory.",
+      true
+    )
+    addArgument(
+      "commissioner-name",
+      commissionerName,
+      "Name of fabric to use. Valid values are \"alpha\", \"beta\", \"gamma\", and integers greater than or equal to "
+              + "4.  The default if not specified is \"alpha\".",
+      true
+    )
+    addArgument(
+      "commissioner-nodeid",
+      0, Long.MAX_VALUE,
+      commissionerNodeId,
+      "The node id to use for java-matter-controller.  If not provided, kTestControllerNodeId (112233, 0x1B669) will be used.",
+      true
+    )
+    addArgument(
+      "use-max-sized-certs",
+      useMaxSizedCerts,
+      "Maximize the size of operational certificates. If not provided or 0 (\"false\"), normally sized operational "
+              + "certificates are generated.",
+      true
+    )
+    addArgument(
+      "only-allow-trusted-cd-keys",
+      onlyAllowTrustedCdKeys,
+      "Only allow trusted CD verifying keys (disallow test keys). If not provided or 0 (\"false\"), untrusted CD "
+              + "verifying keys are allowed. If 1 (\"true\"), test keys are disallowed.",
+      true
+    )
+  }
+
+  // This method returns the commissioner instance to be used for running the command.
+  fun currentCommissioner(): ChipDeviceController {
+    return chipDeviceController
+  }
+
+  /////////// Command Interface /////////
+  @Throws(Exception::class)
+  override fun run() {
+    runCommand()
+  }
+
+  protected abstract fun runCommand()
+  fun setSuccess() {
+    futureResult.setRealResult(RealResult.Success())
+  }
+
+  fun setFailure(error: String?) {
+    futureResult.setRealResult(RealResult.Error(error))
+  }
+
+  fun waitCompleteMs(timeoutMs: Long) {
+    futureResult.setTimeoutMs(timeoutMs)
+    futureResult.waitResult()
+  }
+
+  fun clear() {
+    futureResult.clear()
+  }
+
+  companion object {
+    private val logger = Logger.getLogger(MatterCommand::class.java.name)
+  }    
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommand.kt
index 2d570a6eb0ef7a..706675d7a6bd8f 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommand.kt
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommand.kt
@@ -23,7 +23,7 @@ import com.matter.controller.commands.common.MatterCommand
 import java.util.concurrent.atomic.AtomicLong
 
 class DiscoverCommand(controller: ChipDeviceController, credsIssuer: CredentialsIssuer?) :
-  MatterCommand(controller, "resolve", credsIssuer) {
+  MatterCommand(controller, credsIssuer, "resolve") {
   private val nodeId: AtomicLong = AtomicLong()
   private val fabricId: AtomicLong = AtomicLong()
 
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommissionablesCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommissionablesCommand.kt
index 6eef21ba8c01e0..3c73bc1c07220f 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommissionablesCommand.kt
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommissionablesCommand.kt
@@ -23,13 +23,9 @@ import com.matter.controller.commands.common.CredentialsIssuer
 import com.matter.controller.commands.common.MatterCommand
 import java.util.concurrent.TimeUnit
 
-private const val MAX_DISCOVERED_DEVICES = 10
-private const val TIME_TO_WAIT_FOR_RESULTS_SECONDS = 7L
-
 class DiscoverCommissionablesCommand(
   controller: ChipDeviceController, credsIssuer: CredentialsIssuer?
-) : MatterCommand(controller, "commissionables", credsIssuer) {
-
+) : MatterCommand(controller, credsIssuer, "commissionables") {
   override fun runCommand() {
     currentCommissioner().discoverCommissionableNodes()
 
@@ -55,4 +51,9 @@ class DiscoverCommissionablesCommand(
     System.out.format("\tDiscriminator: %d", device.discriminator)
     System.out.format("\tIP Address : %s%n", device.ipAddress)
   }
+
+  companion object {
+    private const val MAX_DISCOVERED_DEVICES = 10
+    private const val TIME_TO_WAIT_FOR_RESULTS_SECONDS = 7L
+  }  
 }
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommissionersCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommissionersCommand.kt
index ebc0ec1343a9eb..37d9c0838875d5 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommissionersCommand.kt
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/discover/DiscoverCommissionersCommand.kt
@@ -23,6 +23,6 @@ import com.matter.controller.commands.common.MatterCommand
 
 class DiscoverCommissionersCommand(
   controller: ChipDeviceController, credsIssuer: CredentialsIssuer?
-) : MatterCommand(controller, "commissioners", credsIssuer) {
+) : MatterCommand(controller, credsIssuer, "commissioners") {
   override fun runCommand() {}
 }
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/CloseSessionCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/CloseSessionCommand.java
deleted file mode 100644
index f8b911217594ec..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/CloseSessionCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *   Copyright (c) 2022 Project CHIP Authors
- *   All rights reserved.
- *
- *   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.
- *
- */
-
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-import com.matter.controller.commands.common.MatterCommand;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-public final class CloseSessionCommand extends MatterCommand {
-  private final AtomicLong mDestinationId = new AtomicLong();
-  private final AtomicInteger mTimeoutSecs = new AtomicInteger();
-
-  public CloseSessionCommand(ChipDeviceController controller, CredentialsIssuer credsIssuer) {
-    super(controller, "close-session", credsIssuer);
-    addArgument("destination-id", 0, Long.MAX_VALUE, mDestinationId, null, false);
-    addArgument(
-        "timeout",
-        (short) 0,
-        Short.MAX_VALUE,
-        mTimeoutSecs,
-        "Time, in seconds, before this command is considered to have timed out.",
-        false);
-  }
-
-  @Override
-  protected final void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/CloseSessionCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/CloseSessionCommand.kt
new file mode 100644
index 00000000000000..86d7be807fc2d9
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/CloseSessionCommand.kt
@@ -0,0 +1,42 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+import com.matter.controller.commands.common.MatterCommand
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicLong
+
+class CloseSessionCommand(controller: ChipDeviceController, credsIssuer: CredentialsIssuer?) :
+  MatterCommand(controller, credsIssuer, "close-session") {
+  private val destinationId: AtomicLong = AtomicLong()
+  private val timeoutSecs: AtomicInteger = AtomicInteger()
+
+  init {
+    addArgument("destination-id", 0, Long.MAX_VALUE, destinationId, null, false)
+    addArgument(
+      "timeout", 0.toShort(), Short.MAX_VALUE,
+      timeoutSecs,
+      "Time, in seconds, before this command is considered to have timed out.",
+      false
+    )
+  }
+
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.kt
similarity index 80%
rename from examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.java
rename to examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.kt
index 1d614eb5b462d2..055271dd275208 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.java
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/DiscoveryFilterType.kt
@@ -1,31 +1,30 @@
-/*
- *   Copyright (c) 2022 Project CHIP Authors
- *   All rights reserved.
- *
- *   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.
- *
- */
-
-package com.matter.controller.commands.pairing;
-
-public enum DiscoveryFilterType {
-  NONE,
-  SHORT_DISCRIMINATOR,
-  LONG_DISCRIMINATOR,
-  VENDOR_ID,
-  DEVICE_TYPE,
-  COMMISSIONING_MODE,
-  INSTANCE_NAME,
-  COMMISSIONER,
-  COMPRESSED_FABRIC_ID,
-}
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+enum class DiscoveryFilterType {
+  NONE,
+  SHORT_DISCRIMINATOR,
+  LONG_DISCRIMINATOR,
+  VENDOR_ID,
+  DEVICE_TYPE,
+  COMMISSIONING_MODE,
+  INSTANCE_NAME,
+  COMMISSIONER,
+  COMPRESSED_FABRIC_ID
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAddressPaseCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAddressPaseCommand.java
deleted file mode 100644
index 29d4e2c58622a7..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAddressPaseCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public final class PairAddressPaseCommand extends PairingCommand {
-  private static Logger logger = Logger.getLogger(PairAddressPaseCommand.class.getName());
-
-  public PairAddressPaseCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "address-paseonly",
-        PairingModeType.ADDRESS_PASE_ONLY,
-        PairingNetworkType.NONE,
-        credsIssue);
-  }
-
-  @Override
-  public void onPairingComplete(int errorCode) {
-    logger.log(Level.INFO, "onPairingComplete with error code: " + errorCode);
-    if (errorCode == 0) {
-      setSuccess();
-    } else {
-      setFailure("onPairingComplete failure");
-    }
-  }
-
-  @Override
-  protected void runCommand() {
-    currentCommissioner()
-        .establishPaseConnection(
-            getNodeId(), getRemoteAddr().getHostAddress(), getRemotePort(), getSetupPINCode());
-
-    currentCommissioner().setCompletionListener(this);
-    waitCompleteMs(getTimeoutMillis());
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAddressPaseCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAddressPaseCommand.kt
new file mode 100644
index 00000000000000..c8e643677e8a4d
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAddressPaseCommand.kt
@@ -0,0 +1,56 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+import java.util.logging.Level
+import java.util.logging.Logger
+
+class PairAddressPaseCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) : PairingCommand(
+  controller,
+  "address-paseonly",
+  credsIssue,
+  PairingModeType.ADDRESS_PASE_ONLY,
+  PairingNetworkType.NONE
+) {
+  override fun onPairingComplete(errorCode: Int) {
+    logger.log(Level.INFO, "onPairingComplete with error code: $errorCode")
+    if (errorCode == 0) {
+      setSuccess()
+    } else {
+      setFailure("onPairingComplete failure")
+    }
+  }
+
+  override fun runCommand() {
+    currentCommissioner()
+      .establishPaseConnection(
+        getNodeId(),
+        getRemoteAddr().getHostAddress(),
+        getRemotePort(),
+        getSetupPINCode()
+      )
+    currentCommissioner().setCompletionListener(this)
+    waitCompleteMs(getTimeoutMillis())
+  }
+
+  companion object {
+    private val logger = Logger.getLogger(PairAddressPaseCommand::class.java.name)
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAlreadyDiscoveredCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAlreadyDiscoveredCommand.java
deleted file mode 100644
index 259bc61629a630..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAlreadyDiscoveredCommand.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairAlreadyDiscoveredCommand extends PairingCommand {
-  public PairAlreadyDiscoveredCommand(
-      ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "already-discovered",
-        PairingModeType.ALREADY_DISCOVERED,
-        PairingNetworkType.NONE,
-        credsIssue);
-  }
-
-  @Override
-  protected void runCommand() {
-    currentCommissioner()
-        .pairDeviceWithAddress(
-            getNodeId(),
-            getRemoteAddr().getHostAddress(),
-            getRemotePort(),
-            getDiscriminator(),
-            getSetupPINCode(),
-            null);
-    currentCommissioner().setCompletionListener(this);
-    waitCompleteMs(getTimeoutMillis());
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAlreadyDiscoveredCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAlreadyDiscoveredCommand.kt
new file mode 100644
index 00000000000000..f638a2a0ca159c
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAlreadyDiscoveredCommand.kt
@@ -0,0 +1,45 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairAlreadyDiscoveredCommand(
+  controller: ChipDeviceController, credsIssue: CredentialsIssuer?
+) : PairingCommand(
+  controller,
+  "already-discovered",
+  credsIssue,
+  PairingModeType.ALREADY_DISCOVERED,
+  PairingNetworkType.NONE
+) {
+  override fun runCommand() {
+    currentCommissioner()
+      .pairDeviceWithAddress(
+        getNodeId(),
+        getRemoteAddr().getHostAddress(),
+        getRemotePort(),
+        getDiscriminator(),
+        getSetupPINCode(),
+        null
+      )
+    currentCommissioner().setCompletionListener(this)
+    waitCompleteMs(getTimeoutMillis())
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.java
deleted file mode 100644
index a95237b1c89a1f..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairCodeCommand extends PairingCommand {
-  public PairCodeCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(controller, "code", PairingModeType.CODE, PairingNetworkType.NONE, credsIssue);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt
new file mode 100644
index 00000000000000..7f2bc51e5ffb4a
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt
@@ -0,0 +1,26 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairCodeCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) :
+  PairingCommand(controller, "code", credsIssue, PairingModeType.CODE, PairingNetworkType.NONE) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodePaseCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodePaseCommand.java
deleted file mode 100644
index b56ce3a96b4b5a..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodePaseCommand.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairCodePaseCommand extends PairingCommand {
-  public PairCodePaseCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "code-paseonly",
-        PairingModeType.CODE_PASE_ONLY,
-        PairingNetworkType.NONE,
-        credsIssue);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodePaseCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodePaseCommand.kt
new file mode 100644
index 00000000000000..e4041b9648e5f1
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodePaseCommand.kt
@@ -0,0 +1,31 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairCodePaseCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) : PairingCommand(
+  controller,
+  "code-paseonly",
+  credsIssue,
+  PairingModeType.CODE_PASE_ONLY,
+  PairingNetworkType.NONE  
+) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.java
deleted file mode 100644
index 150ca17e8a42a9..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairCodeThreadCommand extends PairingCommand {
-  public PairCodeThreadCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(controller, "code-thread", PairingModeType.CODE, PairingNetworkType.THREAD, credsIssue);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt
new file mode 100644
index 00000000000000..2cd822e32d467f
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt
@@ -0,0 +1,26 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairCodeThreadCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) :
+  PairingCommand(controller, "code-thread", credsIssue, PairingModeType.CODE, PairingNetworkType.THREAD) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.java
deleted file mode 100644
index 2aa764026a3303..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairCodeWifiCommand extends PairingCommand {
-  public PairCodeWifiCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(controller, "code-wifi", PairingModeType.CODE, PairingNetworkType.WIFI, credsIssue);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt
new file mode 100644
index 00000000000000..66f90fd7214cf9
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt
@@ -0,0 +1,26 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairCodeWifiCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) :
+  PairingCommand(controller, "code-wifi", credsIssue, PairingModeType.CODE, PairingNetworkType.WIFI) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommand.java
deleted file mode 100644
index de03adcd7e6850..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommand.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairOnNetworkCommand extends PairingCommand {
-  public PairOnNetworkCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(controller, "onnetwork", PairingModeType.ON_NETWORK, PairingNetworkType.NONE, credsIssue);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommand.kt
new file mode 100644
index 00000000000000..9c18eff8b9602f
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommand.kt
@@ -0,0 +1,26 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairOnNetworkCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) :
+  PairingCommand(controller, "onnetwork", credsIssue, PairingModeType.ON_NETWORK, PairingNetworkType.NONE) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissionerCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissionerCommand.java
deleted file mode 100644
index 2a737503d8e345..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissionerCommand.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairOnNetworkCommissionerCommand extends PairingCommand {
-  public PairOnNetworkCommissionerCommand(
-      ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "onnetwork-commissioner",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.COMMISSIONER);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissionerCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissionerCommand.kt
new file mode 100644
index 00000000000000..618f032dd02917
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissionerCommand.kt
@@ -0,0 +1,34 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairOnNetworkCommissionerCommand(
+  controller: ChipDeviceController, credsIssue: CredentialsIssuer?
+) : PairingCommand(
+  controller,
+  "onnetwork-commissioner",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.COMMISSIONER
+) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissioningModeCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissioningModeCommand.java
deleted file mode 100644
index 62a3c14213bc86..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissioningModeCommand.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairOnNetworkCommissioningModeCommand extends PairingCommand {
-  public PairOnNetworkCommissioningModeCommand(
-      ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "onnetwork-commissioning-mode",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.COMMISSIONING_MODE);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissioningModeCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissioningModeCommand.kt
new file mode 100644
index 00000000000000..2fd5b795052fc1
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkCommissioningModeCommand.kt
@@ -0,0 +1,34 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairOnNetworkCommissioningModeCommand(
+  controller: ChipDeviceController, credsIssue: CredentialsIssuer?
+) : PairingCommand(
+  controller,
+  "onnetwork-commissioning-mode",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.COMMISSIONING_MODE
+) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkDeviceTypeCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkDeviceTypeCommand.java
deleted file mode 100644
index 5a16ae3daf908e..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkDeviceTypeCommand.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairOnNetworkDeviceTypeCommand extends PairingCommand {
-  public PairOnNetworkDeviceTypeCommand(
-      ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "onnetwork-device-type",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.DEVICE_TYPE);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkDeviceTypeCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkDeviceTypeCommand.kt
new file mode 100644
index 00000000000000..6a597c676a8918
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkDeviceTypeCommand.kt
@@ -0,0 +1,34 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairOnNetworkDeviceTypeCommand(
+  controller: ChipDeviceController, credsIssue: CredentialsIssuer?
+) : PairingCommand(
+  controller,
+  "onnetwork-device-type",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.DEVICE_TYPE
+) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkFabricCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkFabricCommand.java
deleted file mode 100644
index c0db4cdc008f77..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkFabricCommand.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-import java.net.UnknownHostException;
-
-public final class PairOnNetworkFabricCommand extends PairingCommand {
-  public PairOnNetworkFabricCommand(ChipDeviceController controller, CredentialsIssuer credsIssue)
-      throws UnknownHostException {
-    super(
-        controller,
-        "onnetwork-fabric",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.COMPRESSED_FABRIC_ID);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkFabricCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkFabricCommand.kt
new file mode 100644
index 00000000000000..1b08e74d689409
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkFabricCommand.kt
@@ -0,0 +1,32 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairOnNetworkFabricCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) : PairingCommand(
+  controller,
+  "onnetwork-fabric",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.COMPRESSED_FABRIC_ID
+) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.java
deleted file mode 100644
index 45d91665dd3671..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairOnNetworkInstanceNameCommand extends PairingCommand {
-  public PairOnNetworkInstanceNameCommand(
-      ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "onnetwork-instance-name",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.INSTANCE_NAME);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.kt
new file mode 100644
index 00000000000000..9b8d392050ddb4
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.kt
@@ -0,0 +1,34 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairOnNetworkInstanceNameCommand(
+  controller: ChipDeviceController, credsIssue: CredentialsIssuer?
+) : PairingCommand(
+  controller,
+  "onnetwork-instance-name",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.INSTANCE_NAME
+) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.java
deleted file mode 100644
index a75b36a991bd0a..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairOnNetworkLongCommand extends PairingCommand {
-  private static final int MATTER_PORT = 5540;
-
-  public PairOnNetworkLongCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "onnetwork-long",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.LONG_DISCRIMINATOR);
-  }
-
-  @Override
-  protected void runCommand() {
-    currentCommissioner()
-        .pairDeviceWithAddress(
-            getNodeId(),
-            getRemoteAddr().getHostAddress(),
-            MATTER_PORT,
-            getDiscriminator(),
-            getSetupPINCode(),
-            null);
-    currentCommissioner().setCompletionListener(this);
-    waitCompleteMs(getTimeoutMillis());
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt
new file mode 100644
index 00000000000000..04955082732378
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt
@@ -0,0 +1,46 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+private const val MATTER_PORT = 5540
+
+class PairOnNetworkLongCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) : PairingCommand(
+  controller,
+  "onnetwork-long",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.LONG_DISCRIMINATOR
+) {
+  override fun runCommand() {
+    currentCommissioner()
+      .pairDeviceWithAddress(
+        getNodeId(),
+        getRemoteAddr().getHostAddress(),
+        MATTER_PORT,
+        getDiscriminator(),
+        getSetupPINCode(),
+        null
+      )
+    currentCommissioner().setCompletionListener(this)
+    waitCompleteMs(getTimeoutMillis())
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.java
deleted file mode 100644
index 6195b8fff690fa..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import chip.devicecontroller.GetConnectedDeviceCallbackJni.GetConnectedDeviceCallback;
-import chip.devicecontroller.InvokeCallback;
-import chip.devicecontroller.model.InvokeElement;
-import com.matter.controller.commands.common.CredentialsIssuer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public final class PairOnNetworkLongImInvokeCommand extends PairingCommand {
-  private static final Logger logger =
-      Logger.getLogger(PairOnNetworkLongImInvokeCommand.class.getName());
-  private static final int MATTER_PORT = 5540;
-  private static final int CLUSTER_ID_IDENTIFY = 0x0003;
-  private static final int IDENTIFY_COMMAND = 0;
-  private long devicePointer;
-
-  private void setDevicePointer(long devicePointer) {
-    this.devicePointer = devicePointer;
-  }
-
-  private class InternalInvokeCallback implements InvokeCallback {
-    @Override
-    public void onError(Exception e) {
-      logger.log(Level.INFO, "Invoke receive onError" + e.getMessage());
-      setFailure("write failure");
-    }
-
-    @Override
-    public void onResponse(InvokeElement element, long successCode) {
-      logger.log(Level.INFO, "Invoke receive OnResponse on ");
-      if (element != null) {
-        logger.log(Level.INFO, element.toString());
-      }
-      logger.log(Level.INFO, "success code is" + String.valueOf(successCode));
-      setSuccess();
-    }
-  }
-
-  private class InternalGetConnectedDeviceCallback implements GetConnectedDeviceCallback {
-    @Override
-    public void onDeviceConnected(long devicePointer) {
-      setDevicePointer(devicePointer);
-      logger.log(Level.INFO, "onDeviceConnected");
-    }
-
-    @Override
-    public void onConnectionFailure(long nodeId, Exception error) {
-      logger.log(Level.INFO, "onConnectionFailure");
-    }
-  }
-
-  public PairOnNetworkLongImInvokeCommand(
-      ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "onnetwork-long-im-invoke",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.LONG_DISCRIMINATOR);
-  }
-
-  @Override
-  protected void runCommand() {
-    // tlv structure with tag 0, unsigned integer 1 inside, {0: 1}
-    byte[] intTLV = {0x15, 0x24, 0x00, 0x01, 0x18};
-    InvokeElement element =
-        InvokeElement.newInstance(
-            /* endpointId= */ 0, CLUSTER_ID_IDENTIFY, IDENTIFY_COMMAND, intTLV, null);
-
-    currentCommissioner()
-        .pairDeviceWithAddress(
-            getNodeId(),
-            getRemoteAddr().getHostAddress(),
-            MATTER_PORT,
-            getDiscriminator(),
-            getSetupPINCode(),
-            null);
-    currentCommissioner().setCompletionListener(this);
-    waitCompleteMs(getTimeoutMillis());
-    currentCommissioner()
-        .getConnectedDevicePointer(getNodeId(), new InternalGetConnectedDeviceCallback());
-    clear();
-
-    currentCommissioner().invoke(new InternalInvokeCallback(), devicePointer, element, 0, 0);
-
-    waitCompleteMs(getTimeoutMillis());
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt
new file mode 100644
index 00000000000000..a3cfd72d94d1af
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt
@@ -0,0 +1,105 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.GetConnectedDeviceCallbackJni.GetConnectedDeviceCallback
+import chip.devicecontroller.InvokeCallback
+import chip.devicecontroller.model.InvokeElement
+import com.matter.controller.commands.common.CredentialsIssuer
+import java.util.logging.Level
+import java.util.logging.Logger
+
+class PairOnNetworkLongImInvokeCommand(
+  controller: ChipDeviceController, credsIssue: CredentialsIssuer?
+) : PairingCommand(
+  controller,
+  "onnetwork-long-im-invoke",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.LONG_DISCRIMINATOR
+) {
+  private var devicePointer: Long = 0
+  private fun setDevicePointer(devicePointer: Long) {
+    this.devicePointer = devicePointer
+  }
+
+  private inner class InternalInvokeCallback : InvokeCallback {
+    override fun onError(e: Exception) {
+      logger.log(Level.INFO, "Invoke receive onError" + e.message)
+      setFailure("write failure")
+    }
+
+    override fun onResponse(element: InvokeElement?, successCode: Long) {
+      logger.log(Level.INFO, "Invoke receive OnResponse on ")
+      if (element != null) {
+        logger.log(Level.INFO, element.toString())
+      }
+      logger.log(Level.INFO, "success code is$successCode")
+      setSuccess()
+    }
+  }
+
+  private inner class InternalGetConnectedDeviceCallback : GetConnectedDeviceCallback {
+    override fun onDeviceConnected(devicePointer: Long) {
+      setDevicePointer(devicePointer)
+      logger.log(Level.INFO, "onDeviceConnected")
+    }
+
+    override fun onConnectionFailure(nodeId: Long, error: Exception) {
+      logger.log(Level.INFO, "onConnectionFailure")
+    }
+  }
+
+  override fun runCommand() {
+    // tlv structure with tag 0, unsigned integer 1 inside, {0: 1}
+    val intTLV = byteArrayOf(0x15, 0x24, 0x00, 0x01, 0x18)
+
+    val element: InvokeElement = InvokeElement.newInstance( /* endpointId= */
+      0L, CLUSTER_ID_IDENTIFY, IDENTIFY_COMMAND, intTLV, null
+    )
+
+    currentCommissioner()
+      .pairDeviceWithAddress(
+        getNodeId(),
+        getRemoteAddr().getHostAddress(),
+        MATTER_PORT,
+        getDiscriminator(),
+        getSetupPINCode(),
+        null
+      )
+    currentCommissioner().setCompletionListener(this)
+    waitCompleteMs(getTimeoutMillis())
+    currentCommissioner()
+      .getConnectedDevicePointer(getNodeId(), InternalGetConnectedDeviceCallback())
+    clear()
+    currentCommissioner().invoke(InternalInvokeCallback(), devicePointer, element, 0, 0)
+    waitCompleteMs(getTimeoutMillis())
+  }
+
+  companion object {
+    private val logger = Logger.getLogger(
+      PairOnNetworkLongImInvokeCommand::class.java.name
+    )
+
+    private const val MATTER_PORT = 5540
+    private const val CLUSTER_ID_IDENTIFY = 0x0003L
+    private const val IDENTIFY_COMMAND = 0L
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.java
deleted file mode 100644
index f63b995610ec38..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import chip.devicecontroller.GetConnectedDeviceCallbackJni.GetConnectedDeviceCallback;
-import chip.devicecontroller.WriteAttributesCallback;
-import chip.devicecontroller.model.AttributeWriteRequest;
-import chip.devicecontroller.model.ChipAttributePath;
-import com.matter.controller.commands.common.CredentialsIssuer;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.annotation.Nullable;
-
-public final class PairOnNetworkLongImWriteCommand extends PairingCommand {
-  private static final int MATTER_PORT = 5540;
-  private long devicePointer;
-  private static final int CLUSTER_ID_BASIC = 0x0028;
-  private static final int ATTR_ID_LOCAL_CONFIG_DISABLED = 16;
-  private static Logger logger = Logger.getLogger(PairOnNetworkLongImWriteCommand.class.getName());
-
-  private void setDevicePointer(long devicePointer) {
-    this.devicePointer = devicePointer;
-  }
-
-  private class InternalWriteAttributesCallback implements WriteAttributesCallback {
-    @Override
-    public void onError(@Nullable ChipAttributePath attributePath, Exception e) {
-      logger.log(Level.INFO, "Write receive onError on ");
-      if (attributePath != null) {
-        logger.log(Level.INFO, attributePath.toString());
-      }
-
-      setFailure("write failure");
-    }
-
-    @Override
-    public void onResponse(ChipAttributePath attributePath) {
-      logger.log(Level.INFO, "Write receve OnResponse on ");
-      if (attributePath != null) {
-        logger.log(Level.INFO, attributePath.toString());
-      }
-      setSuccess();
-    }
-  }
-
-  private class InternalGetConnectedDeviceCallback implements GetConnectedDeviceCallback {
-    @Override
-    public void onDeviceConnected(long devicePointer) {
-      setDevicePointer(devicePointer);
-      logger.log(Level.INFO, "onDeviceConnected");
-    }
-
-    @Override
-    public void onConnectionFailure(long nodeId, Exception error) {
-      logger.log(Level.INFO, "onConnectionFailure");
-    }
-  }
-
-  public PairOnNetworkLongImWriteCommand(
-      ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "onnetwork-long-im-write",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.LONG_DISCRIMINATOR);
-  }
-
-  @Override
-  protected void runCommand() {
-    // boolean true for tlv
-    byte[] booleanTLV = {0x09};
-    AttributeWriteRequest attribute =
-        AttributeWriteRequest.newInstance(
-            /* endpointId= */ 0, CLUSTER_ID_BASIC, ATTR_ID_LOCAL_CONFIG_DISABLED, booleanTLV);
-    ArrayList<AttributeWriteRequest> attributeList = new ArrayList<>();
-    attributeList.add(attribute);
-
-    currentCommissioner()
-        .pairDeviceWithAddress(
-            getNodeId(),
-            getRemoteAddr().getHostAddress(),
-            MATTER_PORT,
-            getDiscriminator(),
-            getSetupPINCode(),
-            null);
-    currentCommissioner().setCompletionListener(this);
-    waitCompleteMs(getTimeoutMillis());
-    currentCommissioner()
-        .getConnectedDevicePointer(getNodeId(), new InternalGetConnectedDeviceCallback());
-    clear();
-
-    currentCommissioner()
-        .write(new InternalWriteAttributesCallback(), devicePointer, attributeList, 0, 0);
-
-    waitCompleteMs(getTimeoutMillis());
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt
new file mode 100644
index 00000000000000..16c9d0b95a2d0b
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt
@@ -0,0 +1,110 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.GetConnectedDeviceCallbackJni.GetConnectedDeviceCallback
+import chip.devicecontroller.WriteAttributesCallback
+import chip.devicecontroller.model.AttributeWriteRequest
+import chip.devicecontroller.model.ChipAttributePath
+import com.matter.controller.commands.common.CredentialsIssuer
+import java.util.logging.Level
+import java.util.logging.Logger
+
+class PairOnNetworkLongImWriteCommand(
+  controller: ChipDeviceController, credsIssue: CredentialsIssuer?
+) : PairingCommand(
+  controller,
+  "onnetwork-long-im-write",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.LONG_DISCRIMINATOR
+) {
+  private var devicePointer: Long = 0
+
+  private inner class InternalWriteAttributesCallback : WriteAttributesCallback {
+    override fun onError(attributePath: ChipAttributePath?, e: Exception) {
+      logger.log(Level.INFO, "Write receive onError on ")
+      if (attributePath != null) {
+        logger.log(Level.INFO, attributePath.toString())
+      }
+      setFailure("write failure")
+    }
+
+    override fun onResponse(attributePath: ChipAttributePath?) {
+      logger.log(Level.INFO, "Write receve OnResponse on ")
+      if (attributePath != null) {
+        logger.log(Level.INFO, attributePath.toString())
+      }
+      setSuccess()
+    }
+  }
+
+  private inner class InternalGetConnectedDeviceCallback : GetConnectedDeviceCallback {
+    override fun onDeviceConnected(devicePointer: Long) {
+      this@PairOnNetworkLongImWriteCommand.devicePointer = devicePointer
+      logger.log(Level.INFO, "onDeviceConnected")
+    }
+
+    override fun onConnectionFailure(nodeId: Long, error: Exception?) {
+      logger.log(Level.INFO, "onConnectionFailure")
+    }
+  }
+
+  override fun runCommand() {
+    // boolean true for tlv
+    val booleanTLV = byteArrayOf(0x09)
+    val attributeList = listOf(
+      AttributeWriteRequest.newInstance(
+        /* endpointId= */ 0,
+        CLUSTER_ID_BASIC,
+        ATTR_ID_LOCAL_CONFIG_DISABLED,
+        booleanTLV,
+      )
+    )
+
+    currentCommissioner()
+      .pairDeviceWithAddress(
+        getNodeId(),
+        getRemoteAddr().getHostAddress(),
+        MATTER_PORT,
+        getDiscriminator(),
+        getSetupPINCode(),
+        null
+      )
+    currentCommissioner().setCompletionListener(this)
+    waitCompleteMs(getTimeoutMillis())
+    currentCommissioner()
+      .getConnectedDevicePointer(getNodeId(), InternalGetConnectedDeviceCallback())
+    clear()
+    currentCommissioner()
+      .write(InternalWriteAttributesCallback(), devicePointer, attributeList, 0, 0)
+    waitCompleteMs(getTimeoutMillis())
+  }
+
+  companion object {
+    private val logger = Logger.getLogger(
+      PairOnNetworkLongImWriteCommand::class.java.name
+    )
+
+    private const val MATTER_PORT = 5540
+    private const val CLUSTER_ID_BASIC = 0x0028L
+    private const val ATTR_ID_LOCAL_CONFIG_DISABLED = 16L
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.java
deleted file mode 100644
index 135694632863d1..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairOnNetworkShortCommand extends PairingCommand {
-  public PairOnNetworkShortCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "onnetwork-short",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.SHORT_DISCRIMINATOR);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.kt
new file mode 100644
index 00000000000000..ca294852776786
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.kt
@@ -0,0 +1,32 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairOnNetworkShortCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) : PairingCommand(
+  controller,
+  "onnetwork-short",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.SHORT_DISCRIMINATOR
+) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.java
deleted file mode 100644
index 65bdfc57c3cd94..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class PairOnNetworkVendorCommand extends PairingCommand {
-  public PairOnNetworkVendorCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(
-        controller,
-        "onnetwork-vendor",
-        PairingModeType.ON_NETWORK,
-        PairingNetworkType.NONE,
-        credsIssue,
-        DiscoveryFilterType.VENDOR_ID);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.kt
new file mode 100644
index 00000000000000..6316bffb9057e1
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.kt
@@ -0,0 +1,32 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class PairOnNetworkVendorCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) : PairingCommand(
+  controller,
+  "onnetwork-vendor",
+  credsIssue,
+  PairingModeType.ON_NETWORK,
+  PairingNetworkType.NONE,
+  DiscoveryFilterType.VENDOR_ID
+) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.java
deleted file mode 100644
index 4aa95356a05f54..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- *   Copyright (c) 2022 Project CHIP Authors
- *   All rights reserved.
- *
- *   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.
- *
- */
-
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-import com.matter.controller.commands.common.IPAddress;
-import com.matter.controller.commands.common.MatterCommand;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public abstract class PairingCommand extends MatterCommand
-    implements ChipDeviceController.CompletionListener {
-  private PairingModeType mPairingMode = PairingModeType.NONE;
-  private PairingNetworkType mNetworkType = PairingNetworkType.NONE;
-  private DiscoveryFilterType mFilterType = DiscoveryFilterType.NONE;
-  private final IPAddress mRemoteAddr;
-  private final AtomicLong mNodeId = new AtomicLong();
-  private final AtomicLong mDiscoveryFilterCode = new AtomicLong();
-  private final AtomicLong mTimeoutMillis = new AtomicLong();
-  private final AtomicBoolean mDiscoverOnce = new AtomicBoolean();
-  private final AtomicBoolean mUseOnlyOnNetworkDiscovery = new AtomicBoolean();
-  private final AtomicInteger mRemotePort = new AtomicInteger();
-  private final AtomicInteger mDiscriminator = new AtomicInteger();
-  private final AtomicInteger mSetupPINCode = new AtomicInteger();
-  private final StringBuffer mOperationalDataset = new StringBuffer();
-  private final StringBuffer mSSID = new StringBuffer();
-  private final StringBuffer mPassword = new StringBuffer();
-  private final StringBuffer mOnboardingPayload = new StringBuffer();
-  private final StringBuffer mDiscoveryFilterInstanceName = new StringBuffer();
-  private static Logger logger = Logger.getLogger(PairingCommand.class.getName());
-
-  @Override
-  public void onConnectDeviceComplete() {
-    logger.log(Level.INFO, "onConnectDeviceComplete");
-  }
-
-  @Override
-  public void onStatusUpdate(int status) {
-    logger.log(Level.INFO, "onStatusUpdate with status: " + status);
-  }
-
-  @Override
-  public void onPairingComplete(int errorCode) {
-    logger.log(Level.INFO, "onPairingComplete with error code: " + errorCode);
-    if (errorCode != 0) {
-      setFailure("onPairingComplete failure");
-    }
-  }
-
-  @Override
-  public void onPairingDeleted(int errorCode) {
-    logger.log(Level.INFO, "onPairingDeleted with error code: " + errorCode);
-  }
-
-  @Override
-  public void onCommissioningComplete(long nodeId, int errorCode) {
-    logger.log(Level.INFO, "onCommissioningComplete with error code: " + errorCode);
-    if (errorCode == 0) {
-      setSuccess();
-    } else {
-      setFailure("onCommissioningComplete failure");
-    }
-  }
-
-  @Override
-  public void onReadCommissioningInfo(
-      int vendorId, int productId, int wifiEndpointId, int threadEndpointId) {
-    logger.log(Level.INFO, "onReadCommissioningInfo");
-  }
-
-  @Override
-  public void onCommissioningStatusUpdate(long nodeId, String stage, int errorCode) {
-    logger.log(Level.INFO, "onCommissioningStatusUpdate");
-  }
-
-  @Override
-  public void onNotifyChipConnectionClosed() {
-    logger.log(Level.INFO, "onNotifyChipConnectionClosed");
-  }
-
-  @Override
-  public void onCloseBleComplete() {
-    logger.log(Level.INFO, "onCloseBleComplete");
-  }
-
-  @Override
-  public void onError(Throwable error) {
-    setFailure(error.toString());
-    logger.log(Level.INFO, "onError with error: " + error.toString());
-  }
-
-  @Override
-  public void onOpCSRGenerationComplete(byte[] csr) {
-    logger.log(Level.INFO, "onOpCSRGenerationComplete");
-    for (int i = 0; i < csr.length; i++) {
-      System.out.print(csr[i] + " ");
-    }
-  }
-
-  public long getNodeId() {
-    return mNodeId.get();
-  }
-
-  public IPAddress getRemoteAddr() {
-    return mRemoteAddr;
-  }
-
-  public int getRemotePort() {
-    return mRemotePort.get();
-  }
-
-  public int getSetupPINCode() {
-    return mSetupPINCode.get();
-  }
-
-  public int getDiscriminator() {
-    return mDiscriminator.get();
-  }
-
-  public long getTimeoutMillis() {
-    return mTimeoutMillis.get();
-  }
-
-  public PairingCommand(
-      ChipDeviceController controller,
-      String commandName,
-      PairingModeType mode,
-      PairingNetworkType networkType,
-      CredentialsIssuer credsIssuer) {
-    this(controller, commandName, mode, networkType, credsIssuer, DiscoveryFilterType.NONE);
-  }
-
-  public PairingCommand(
-      ChipDeviceController controller,
-      String commandName,
-      PairingModeType mode,
-      PairingNetworkType networkType,
-      CredentialsIssuer credsIssuer,
-      DiscoveryFilterType filterType) {
-    super(controller, commandName, credsIssuer);
-    this.mPairingMode = mode;
-    this.mNetworkType = networkType;
-    this.mFilterType = filterType;
-
-    try {
-      this.mRemoteAddr = new IPAddress(InetAddress.getByName("::1"));
-    } catch (UnknownHostException e) {
-      throw new RuntimeException(e);
-    }
-
-    addArgument("node-id", 0, Long.MAX_VALUE, mNodeId, null, false);
-
-    switch (networkType) {
-      case NONE:
-        break;
-      case WIFI:
-        addArgument("ssid", mSSID, null, false);
-        addArgument("password", mPassword, null, false);
-        break;
-      case THREAD:
-        addArgument("operationalDataset", mOperationalDataset, null, false);
-        break;
-    }
-
-    switch (mode) {
-      case NONE:
-        break;
-      case CODE:
-      case CODE_PASE_ONLY:
-        addArgument("payload", mOnboardingPayload, null, false);
-        addArgument("discover-once", mDiscoverOnce, null, false);
-        addArgument("use-only-onnetwork-discovery", mUseOnlyOnNetworkDiscovery, null, false);
-        break;
-      case ADDRESS_PASE_ONLY:
-        addArgument("setup-pin-code", 0, 134217727, mSetupPINCode, null, false);
-        addArgument("device-remote-ip", mRemoteAddr, false);
-        addArgument("device-remote-port", (short) 0, Short.MAX_VALUE, mRemotePort, null, false);
-        break;
-      case BLE:
-        addArgument("setup-pin-code", 0, 134217727, mSetupPINCode, null, false);
-        addArgument("discriminator", (short) 0, (short) 4096, mDiscriminator, null, false);
-        break;
-      case ON_NETWORK:
-        addArgument("setup-pin-code", 0, 134217727, mSetupPINCode, null, false);
-        break;
-      case SOFT_AP:
-        addArgument("setup-pin-code", 0, 134217727, mSetupPINCode, null, false);
-        addArgument("discriminator", (short) 0, (short) 4096, mDiscriminator, null, false);
-        addArgument("device-remote-ip", mRemoteAddr, false);
-        addArgument("device-remote-port", (short) 0, Short.MAX_VALUE, mRemotePort, null, false);
-        break;
-      case ALREADY_DISCOVERED:
-        addArgument("setup-pin-code", 0, 134217727, mSetupPINCode, null, false);
-        addArgument("device-remote-ip", mRemoteAddr, false);
-        addArgument("device-remote-port", (short) 0, Short.MAX_VALUE, mRemotePort, null, false);
-        break;
-    }
-
-    switch (filterType) {
-      case NONE:
-        break;
-      case SHORT_DISCRIMINATOR:
-        addArgument("discriminator", (short) 0, (short) 4096, mDiscriminator, null, false);
-        break;
-      case LONG_DISCRIMINATOR:
-        addArgument("discriminator", (short) 0, (short) 4096, mDiscriminator, null, false);
-        break;
-      case VENDOR_ID:
-        addArgument("vendor-id", (short) 0, Short.MAX_VALUE, mDiscoveryFilterCode, null, false);
-        break;
-      case COMPRESSED_FABRIC_ID:
-        addArgument("fabric-id", 0, Long.MAX_VALUE, mDiscoveryFilterCode, null, false);
-        break;
-      case COMMISSIONING_MODE:
-      case COMMISSIONER:
-        break;
-      case DEVICE_TYPE:
-        addArgument("device-type", (short) 0, Short.MAX_VALUE, mDiscoveryFilterCode, null, false);
-        break;
-      case INSTANCE_NAME:
-        addArgument("name", mDiscoveryFilterInstanceName, null, false);
-        break;
-    }
-
-    addArgument("timeout", (long) 0, Long.MAX_VALUE, mTimeoutMillis, null, false);
-  }
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt
new file mode 100644
index 00000000000000..a6df1b0b450f6a
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt
@@ -0,0 +1,233 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+import com.matter.controller.commands.common.IPAddress
+import com.matter.controller.commands.common.MatterCommand
+import java.net.InetAddress
+import java.net.UnknownHostException
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicLong
+import java.util.logging.Level
+import java.util.logging.Logger
+
+abstract class PairingCommand(
+  controller: ChipDeviceController,
+  commandName: String,
+  credsIssuer: CredentialsIssuer?,
+  private val pairingMode: PairingModeType = PairingModeType.NONE,
+  private val networkType: PairingNetworkType = PairingNetworkType.NONE,
+  private val filterType: DiscoveryFilterType = DiscoveryFilterType.NONE
+) : MatterCommand(controller, credsIssuer, commandName), ChipDeviceController.CompletionListener {
+  private val remoteAddr: IPAddress = IPAddress(InetAddress.getByName("::1"))
+  private val nodeId = AtomicLong()
+  private val discoveryFilterCode = AtomicLong()
+  private val timeoutMillis = AtomicLong()
+  private val discoverOnce = AtomicBoolean()
+  private val useOnlyOnNetworkDiscovery = AtomicBoolean()
+  private val remotePort = AtomicInteger()
+  private val discriminator = AtomicInteger()
+  private val setupPINCode = AtomicLong()
+  private val operationalDataset = StringBuffer()
+  private val ssid = StringBuffer()
+  private val password = StringBuffer()
+  private val onboardingPayload = StringBuffer()
+  private val discoveryFilterInstanceName = StringBuffer()
+
+  init {
+    addArgument("node-id", 0, Long.MAX_VALUE, nodeId, null, false)
+
+    when (networkType) {
+      PairingNetworkType.NONE -> {}
+      PairingNetworkType.WIFI -> {
+        addArgument("ssid", ssid, null, false)
+        addArgument("password", password, null, false)
+      }
+
+      PairingNetworkType.THREAD -> addArgument("operationalDataset", operationalDataset, null, false)
+    }
+
+    when (pairingMode) {
+      PairingModeType.NONE -> {}
+      PairingModeType.CODE, PairingModeType.CODE_PASE_ONLY -> {
+        addArgument("payload", onboardingPayload, null, false)
+        addArgument("discover-once", discoverOnce, null, false)
+        addArgument("use-only-onnetwork-discovery", useOnlyOnNetworkDiscovery, null, false)
+      }
+
+      PairingModeType.ADDRESS_PASE_ONLY -> {
+        addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+        addArgument("device-remote-ip", remoteAddr, false)
+        addArgument("device-remote-port", 0.toShort(), Short.MAX_VALUE, remotePort, null, false)
+      }
+
+      PairingModeType.BLE -> {
+        addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+        addArgument("discriminator", 0.toShort(), 4096.toShort(), discriminator, null, false)
+      }
+
+      PairingModeType.ON_NETWORK -> addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+      PairingModeType.SOFT_AP -> {
+        addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+        addArgument("discriminator", 0.toShort(), 4096.toShort(), discriminator, null, false)
+        addArgument("device-remote-ip", remoteAddr, false)
+        addArgument("device-remote-port", 0.toShort(), Short.MAX_VALUE, remotePort, null, false)
+      }
+
+      PairingModeType.ALREADY_DISCOVERED -> {
+        addArgument("setup-pin-code", 0, 134217727, setupPINCode, null, false)
+        addArgument("device-remote-ip", remoteAddr, false)
+        addArgument("device-remote-port", 0.toShort(), Short.MAX_VALUE, remotePort, null, false)
+      }
+    }
+
+    when (filterType) {
+      DiscoveryFilterType.NONE -> {}
+      DiscoveryFilterType.SHORT_DISCRIMINATOR,
+      DiscoveryFilterType.LONG_DISCRIMINATOR -> addArgument(
+        "discriminator",
+        0.toShort(),
+        4096.toShort(),
+        discriminator,
+        null,
+        false
+      )
+
+      DiscoveryFilterType.VENDOR_ID -> addArgument(
+        "vendor-id",
+        1.toShort(),
+        Short.MAX_VALUE,
+        discoveryFilterCode,
+        null,
+        false
+      )
+
+      DiscoveryFilterType.COMPRESSED_FABRIC_ID -> addArgument(
+        "fabric-id",
+        0L,
+        Long.MAX_VALUE,
+        discoveryFilterCode,
+        null,
+        false
+      )
+
+      DiscoveryFilterType.COMMISSIONING_MODE, DiscoveryFilterType.COMMISSIONER -> {}
+      DiscoveryFilterType.DEVICE_TYPE -> addArgument(
+        "device-type",
+        0.toShort(),
+        Short.MAX_VALUE,
+        discoveryFilterCode,
+        null,
+        false
+      )
+
+      DiscoveryFilterType.INSTANCE_NAME -> addArgument("name", discoveryFilterInstanceName, null, false)
+    }
+
+    addArgument("timeout", 0L, Long.MAX_VALUE, timeoutMillis, null, false)
+  }
+
+  override fun onConnectDeviceComplete() {
+    logger.log(Level.INFO, "onConnectDeviceComplete")
+  }
+
+  override fun onStatusUpdate(status: Int) {
+    logger.log(Level.INFO, "onStatusUpdate with status: $status")
+  }
+
+  override fun onPairingComplete(errorCode: Int) {
+    logger.log(Level.INFO, "onPairingComplete with error code: $errorCode")
+    if (errorCode != 0) {
+      setFailure("onPairingComplete failure")
+    }
+  }
+
+  override fun onPairingDeleted(errorCode: Int) {
+    logger.log(Level.INFO, "onPairingDeleted with error code: $errorCode")
+  }
+
+  override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
+    logger.log(Level.INFO, "onCommissioningComplete with error code: $errorCode")
+    if (errorCode == 0) {
+      setSuccess()
+    } else {
+      setFailure("onCommissioningComplete failure")
+    }
+  }
+
+  override fun onReadCommissioningInfo(
+    vendorId: Int, productId: Int, wifiEndpointId: Int, threadEndpointId: Int
+  ) {
+    logger.log(Level.INFO, "onReadCommissioningInfo")
+  }
+
+  override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: Int) {
+    logger.log(Level.INFO, "onCommissioningStatusUpdate")
+  }
+
+  override fun onNotifyChipConnectionClosed() {
+    logger.log(Level.INFO, "onNotifyChipConnectionClosed")
+  }
+
+  override fun onCloseBleComplete() {
+    logger.log(Level.INFO, "onCloseBleComplete")
+  }
+
+  override fun onError(error: Throwable) {
+    setFailure(error.toString())
+    logger.log(Level.INFO, "onError with error: $error")
+  }
+
+  override fun onOpCSRGenerationComplete(csr: ByteArray) {
+    logger.log(Level.INFO, "onOpCSRGenerationComplete")
+    for (i in csr.indices) {
+      print(csr[i].toString() + " ")
+    }
+  }
+
+  fun getNodeId(): Long {
+    return nodeId.get()
+  }
+
+  fun getRemoteAddr(): IPAddress {
+    return remoteAddr
+  }
+
+  fun getRemotePort(): Int {
+    return remotePort.get()
+  }
+
+  fun getSetupPINCode(): Long {
+    return setupPINCode.get()
+  }
+
+  fun getDiscriminator(): Int {
+    return discriminator.get()
+  }
+
+  fun getTimeoutMillis(): Long {
+    return timeoutMillis.get()
+  }
+
+  companion object {
+    private val logger = Logger.getLogger(PairingCommand::class.java.name)
+  }
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingModeType.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingModeType.kt
similarity index 80%
rename from examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingModeType.java
rename to examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingModeType.kt
index 63556f7b3bfe82..7c8430edbe3eaf 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingModeType.java
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingModeType.kt
@@ -1,30 +1,29 @@
-/*
- *   Copyright (c) 2022 Project CHIP Authors
- *   All rights reserved.
- *
- *   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.
- *
- */
-
-package com.matter.controller.commands.pairing;
-
-public enum PairingModeType {
-  NONE,
-  CODE,
-  CODE_PASE_ONLY,
-  ADDRESS_PASE_ONLY,
-  BLE,
-  SOFT_AP,
-  ALREADY_DISCOVERED,
-  ON_NETWORK;
-}
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+enum class PairingModeType {
+  NONE,
+  CODE,
+  CODE_PASE_ONLY,
+  ADDRESS_PASE_ONLY,
+  BLE,
+  SOFT_AP,
+  ALREADY_DISCOVERED,
+  ON_NETWORK
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingNetworkType.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingNetworkType.kt
similarity index 77%
rename from examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingNetworkType.java
rename to examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingNetworkType.kt
index 650fad5f887552..0056b29af67065 100644
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingNetworkType.java
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingNetworkType.kt
@@ -1,25 +1,22 @@
-/*
- *   Copyright (c) 2022 Project CHIP Authors
- *   All rights reserved.
- *
- *   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.
- *
- */
-
-package com.matter.controller.commands.pairing;
-
-public enum PairingNetworkType {
-  NONE,
-  WIFI,
-  THREAD,
-}
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+enum class PairingNetworkType {
+  NONE, WIFI, THREAD
+}
\ No newline at end of file
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/UnpairCommand.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/UnpairCommand.java
deleted file mode 100644
index 2c33c8dc551a1b..00000000000000
--- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/UnpairCommand.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.matter.controller.commands.pairing;
-
-import chip.devicecontroller.ChipDeviceController;
-import com.matter.controller.commands.common.CredentialsIssuer;
-
-public final class UnpairCommand extends PairingCommand {
-  public UnpairCommand(ChipDeviceController controller, CredentialsIssuer credsIssue) {
-    super(controller, "unpair", PairingModeType.NONE, PairingNetworkType.NONE, credsIssue);
-  }
-
-  @Override
-  protected void runCommand() {}
-}
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/UnpairCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/UnpairCommand.kt
new file mode 100644
index 00000000000000..4e10ba1edd7b6c
--- /dev/null
+++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/UnpairCommand.kt
@@ -0,0 +1,26 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   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.
+ *
+ */
+package com.matter.controller.commands.pairing
+
+import chip.devicecontroller.ChipDeviceController
+import com.matter.controller.commands.common.CredentialsIssuer
+
+class UnpairCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) :
+  PairingCommand(controller, "unpair", credsIssue, PairingModeType.NONE, PairingNetworkType.NONE) {
+  override fun runCommand() {}
+}
\ No newline at end of file
diff --git a/examples/light-switch-app/esp32/main/include/DeviceCallbacks.h b/examples/light-switch-app/esp32/main/include/DeviceCallbacks.h
index 0e226f574feeb5..93c53cbfd37e97 100644
--- a/examples/light-switch-app/esp32/main/include/DeviceCallbacks.h
+++ b/examples/light-switch-app/esp32/main/include/DeviceCallbacks.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include <BindingHandler.h>
 #include <common/CHIPDeviceManager.h>
 #include <common/CommonDeviceCallbacks.h>
 
@@ -39,3 +40,11 @@ class AppDeviceCallbacks : public CommonDeviceCallbacks
     void OnOffSwitchConfigurationAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t type,
                                                          uint8_t * value, uint16_t size);
 };
+
+class AppDeviceCallbacksDelegate : public DeviceCallbacksDelegate
+{
+public:
+    void OnIPv4ConnectivityEstablished(void) override {}
+    void OnIPv4ConnectivityLost(void) override {}
+    void OnDnssdInitialized(void) override { InitBindingHandler(); }
+};
diff --git a/examples/light-switch-app/esp32/main/main.cpp b/examples/light-switch-app/esp32/main/main.cpp
index 9383817e3c095d..43c98425fe565c 100644
--- a/examples/light-switch-app/esp32/main/main.cpp
+++ b/examples/light-switch-app/esp32/main/main.cpp
@@ -33,6 +33,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <platform/ESP32/ESP32Utils.h>
 
 #if CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
 #include <platform/ESP32/ESP32FactoryDataProvider.h>
@@ -54,6 +55,7 @@
 using namespace ::chip;
 using namespace ::chip::Credentials;
 using namespace ::chip::DeviceManager;
+using namespace ::chip::DeviceLayer;
 
 namespace {
 #if CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
@@ -70,6 +72,7 @@ DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 static const char * TAG = "light-switch-app";
 
 static AppDeviceCallbacks EchoCallbacks;
+static AppDeviceCallbacksDelegate sAppDeviceCallbacksDelegate;
 
 static void InitServer(intptr_t context)
 {
@@ -77,8 +80,6 @@ static void InitServer(intptr_t context)
     PrintOnboardingCodes(chip::RendezvousInformationFlags(CONFIG_RENDEZVOUS_MODE));
 
     Esp32AppServer::Init(); // Init ZCL Data Model and CHIP App Server AND Initialize device attestation config
-
-    InitBindingHandler();
 }
 
 extern "C" void app_main()
@@ -90,11 +91,25 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
         return;
     }
+    err = esp_event_loop_create_default();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "esp_event_loop_create_default() failed: %s", esp_err_to_name(err));
+        return;
+    }
 
     ESP_LOGI(TAG, "==================================================");
     ESP_LOGI(TAG, "chip-esp32-light-switch-example starting");
     ESP_LOGI(TAG, "==================================================");
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (DeviceLayer::Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize the Wi-Fi stack");
+        return;
+    }
+#endif
+
 #if CONFIG_ENABLE_CHIP_SHELL
     chip::LaunchShell();
 #endif // CONFIG_ENABLE_CHIP_SHELL
@@ -103,6 +118,7 @@ extern "C" void app_main()
 
     CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
     CHIP_ERROR error              = deviceMgr.Init(&EchoCallbacks);
+    DeviceCallbacksDelegate::Instance().SetAppDelegate(&sAppDeviceCallbacksDelegate);
     if (error != CHIP_NO_ERROR)
     {
         ESP_LOGE(TAG, "device.Init() failed: %" CHIP_ERROR_FORMAT, error.Format());
@@ -120,12 +136,12 @@ extern "C" void app_main()
 #endif // CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-    if (ThreadStackMgr().InitThreadStack() != CHIP_NO_ERROR)
+    if (DeviceLayer::ThreadStackMgr().InitThreadStack() != CHIP_NO_ERROR)
     {
         ESP_LOGE(TAG, "Failed to initialize Thread stack");
         return;
     }
-    if (ThreadStackMgr().StartThreadTask() != CHIP_NO_ERROR)
+    if (DeviceLayer::ThreadStackMgr().StartThreadTask() != CHIP_NO_ERROR)
     {
         ESP_LOGE(TAG, "Failed to launch Thread task");
         return;
diff --git a/examples/lighting-app/bouffalolab/common/AppTask.cpp b/examples/lighting-app/bouffalolab/common/AppTask.cpp
index 16b4d732ac3c7f..9d514cb76cca39 100644
--- a/examples/lighting-app/bouffalolab/common/AppTask.cpp
+++ b/examples/lighting-app/bouffalolab/common/AppTask.cpp
@@ -644,18 +644,17 @@ void AppTask::ButtonEventHandler(void * arg)
     uint32_t presstime;
     if (ButtonPressed())
     {
-        hosal_gpio_irq_set(&gpio_key, HOSAL_IRQ_TRIG_NEG_LEVEL, GetAppTask().ButtonEventHandler, NULL);
+        bl_set_gpio_intmod(gpio_key.port, 1, HOSAL_IRQ_TRIG_NEG_LEVEL);
 
         GetAppTask().mButtonPressedTime = chip::System::SystemClock().GetMonotonicMilliseconds64().count();
         GetAppTask().PostEvent(APP_EVENT_BTN_FACTORY_RESET_PRESS);
     }
     else
     {
-        hosal_gpio_irq_set(&gpio_key, HOSAL_IRQ_TRIG_POS_PULSE, GetAppTask().ButtonEventHandler, NULL);
+        bl_set_gpio_intmod(gpio_key.port, 1, HOSAL_IRQ_TRIG_POS_PULSE);
 
         if (GetAppTask().mButtonPressedTime)
         {
-
             presstime = chip::System::SystemClock().GetMonotonicMilliseconds64().count() - GetAppTask().mButtonPressedTime;
             if (presstime >= APP_BUTTON_PRESS_LONG)
             {
diff --git a/examples/lighting-app/esp32/CMakeLists.txt b/examples/lighting-app/esp32/CMakeLists.txt
index 92f2a10fec2f0b..e9a5418e8dda46 100644
--- a/examples/lighting-app/esp32/CMakeLists.txt
+++ b/examples/lighting-app/esp32/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2021 Project CHIP Authors
+#    Copyright (c) 2021-2023 Project CHIP Authors
 #    All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +29,12 @@ set(EXTRA_COMPONENT_DIRS
     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/QRCode"
 )
 
+if(${IDF_TARGET} STREQUAL "esp32")
+    list(APPEND EXTRA_COMPONENT_DIRS "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/m5stack-tft/repo/components/tft"
+                                     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/m5stack-tft/repo/components/spidriver"
+                                     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/screen-framework")
+endif()
+
 project(chip-lighting-app)
 
 # C++17 is required for RPC build.
@@ -46,6 +52,8 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND)
 
 #For the H2, -Werror=uninitialized will cause an error in "src/lib/support/LambdaBridge.h"
 idf_build_set_property(COMPILE_OPTIONS "-Wno-error=uninitialized" APPEND)
+#For ESP32-C6, -Werror=array-bounds will cause an error in 'third_party/nlfaultinjection/repo/src/nlfaultinjection.cpp'
+idf_build_set_property(COMPILE_OPTIONS "-Wno-error=array-bounds" APPEND)
 
 flashing_script()
 
diff --git a/examples/lighting-app/esp32/main/AppTask.cpp b/examples/lighting-app/esp32/main/AppTask.cpp
index 91f91340e37bca..6369cf91089670 100644
--- a/examples/lighting-app/esp32/main/AppTask.cpp
+++ b/examples/lighting-app/esp32/main/AppTask.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright (c) 2022-2023 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,8 @@
 #include "esp_log.h"
 #include "freertos/FreeRTOS.h"
 
+#include "DeviceWithDisplay.h"
+
 #include <app-common/zap-generated/attributes/Accessors.h>
 
 #define APP_TASK_NAME "APP"
@@ -36,7 +38,6 @@ using namespace ::chip::DeviceLayer;
 static const char * TAG = "app-task";
 
 LEDWidget AppLED;
-Button AppButton;
 
 namespace {
 constexpr EndpointId kLightEndpointId = 1;
@@ -61,14 +62,59 @@ CHIP_ERROR AppTask::StartAppTask()
     return (xReturned == pdPASS) ? CHIP_NO_ERROR : APP_ERROR_CREATE_TASK_FAILED;
 }
 
+void AppTask::ButtonEventHandler(const uint8_t buttonHandle, uint8_t btnAction)
+{
+    if (btnAction != APP_BUTTON_PRESSED)
+    {
+        return;
+    }
+
+    AppEvent button_event = {};
+    button_event.Type     = AppEvent::kEventType_Button;
+
+#if CONFIG_HAVE_DISPLAY
+    button_event.ButtonEvent.PinNo  = buttonHandle;
+    button_event.ButtonEvent.Action = btnAction;
+    button_event.mHandler           = ButtonPressedAction;
+#else
+    button_event.mHandler = AppTask::LightingActionEventHandler;
+#endif
+
+    sAppTask.PostEvent(&button_event);
+}
+
+#if CONFIG_DEVICE_TYPE_M5STACK
+void AppTask::ButtonPressedAction(AppEvent * aEvent)
+{
+    uint32_t io_num = aEvent->ButtonEvent.PinNo;
+    int level       = gpio_get_level((gpio_num_t) io_num);
+    if (level == 0)
+    {
+        bool woken = WakeDisplay();
+        if (woken)
+        {
+            return;
+        }
+        // Button 1 is connected to the pin 39
+        // Button 2 is connected to the pin 38
+        // Button 3 is connected to the pin 37
+        // So we use 40 - io_num to map the pin number to button number
+        ScreenManager::ButtonPressed(40 - io_num);
+    }
+}
+#endif
+
 CHIP_ERROR AppTask::Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
     AppLED.Init();
-    AppButton.Init();
 
-    AppButton.SetButtonPressCallback(ButtonPressCallback);
+#if CONFIG_HAVE_DISPLAY
+    InitDeviceDisplay();
+
+    AppLED.SetVLED(ScreenManager::AddVLED(TFT_YELLOW));
+#endif
 
     return err;
 }
@@ -139,14 +185,6 @@ void AppTask::LightingActionEventHandler(AppEvent * aEvent)
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 }
 
-void AppTask::ButtonPressCallback()
-{
-    AppEvent button_event;
-    button_event.Type     = AppEvent::kEventType_Button;
-    button_event.mHandler = AppTask::LightingActionEventHandler;
-    sAppTask.PostEvent(&button_event);
-}
-
 void AppTask::UpdateClusterState()
 {
     ESP_LOGI(TAG, "Writing to OnOff cluster");
diff --git a/examples/lighting-app/esp32/main/Button.cpp b/examples/lighting-app/esp32/main/Button.cpp
index aadae002bc2d08..ea4959ff6188cb 100644
--- a/examples/lighting-app/esp32/main/Button.cpp
+++ b/examples/lighting-app/esp32/main/Button.cpp
@@ -1,6 +1,7 @@
 /*
  *
- *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright (c) 2022-2023 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -14,53 +15,95 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#include "driver/gpio.h"
+#include "esp_check.h"
+#include "esp_log.h"
+#include "esp_system.h"
 
+#include "AppTask.h"
 #include "Button.h"
-#include "esp_attr.h"
+#include "Globals.h"
+#include "ScreenManager.h"
+#include <lib/support/CodeUtils.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <vector>
 
-#define GPIO_INPUT_IO_0 9
-#define GPIO_INPUT_PIN_SEL (1ULL << GPIO_INPUT_IO_0)
-#define ESP_INTR_FLAG_DEFAULT 0
+static const char * TAG = "Button.cpp";
 
-static const char * TAG = "Button";
+extern Button gButtons[BUTTON_NUMBER];
 
-static Button::ButtonPressCallback button_press_handler = nullptr;
+Button::Button() {}
 
-static void IRAM_ATTR gpio_isr_handler(void * arg)
+Button::Button(gpio_num_t gpioNum)
 {
-    if (button_press_handler != nullptr)
+    mGPIONum = gpioNum;
+}
+
+int32_t Find_Button_Via_Pin(gpio_num_t gpioNum)
+{
+    for (int i = 0; i < BUTTON_NUMBER; i++)
     {
-        button_press_handler();
+        if (gButtons[i].GetGPIONum() == gpioNum)
+        {
+            return i;
+        }
     }
+    return -1;
 }
 
-void Button::Init()
+void IRAM_ATTR button_isr_handler(void * arg)
 {
-    /* Initialize button interrupt*/
-    // zero-initialize the config structure.
+    uint32_t gpio_num = (uint32_t) arg;
+    int32_t idx       = Find_Button_Via_Pin((gpio_num_t) gpio_num);
+    if (idx == -1)
+    {
+        return;
+    }
+    BaseType_t taskWoken = pdFALSE;
+    xTimerStartFromISR(gButtons[idx].mbuttonTimer,
+                       &taskWoken); // If the timer had already been started ,restart it will reset its expiry time
+}
+
+esp_err_t Button::Init()
+{
+    return Init(mGPIONum);
+}
+
+esp_err_t Button::Init(gpio_num_t gpioNum)
+{
+    esp_err_t ret = ESP_OK;
+
+    mGPIONum = gpioNum;
+    //  zero-initialize the config structure.
     gpio_config_t io_conf = {};
-    // interrupt of rising edge
+    // interrupt of falling edge
     io_conf.intr_type = GPIO_INTR_NEGEDGE;
     // bit mask of the pins, use GPIO4/5 here
-    io_conf.pin_bit_mask = GPIO_INPUT_PIN_SEL;
+    io_conf.pin_bit_mask = 1ULL << gpioNum;
     // set as input mode
     io_conf.mode = GPIO_MODE_INPUT;
     // enable pull-up mode
     io_conf.pull_up_en = GPIO_PULLUP_ENABLE;
+
     gpio_config(&io_conf);
 
-    // install gpio isr service
-    gpio_install_isr_service(ESP_INTR_FLAG_DEFAULT);
     // hook isr handler for specific gpio pin
-    gpio_isr_handler_add(static_cast<gpio_num_t>(GPIO_INPUT_IO_0), gpio_isr_handler, (void *) GPIO_INPUT_IO_0);
+    ret = gpio_isr_handler_add(gpioNum, button_isr_handler, (void *) gpioNum);
+    ESP_RETURN_ON_ERROR(ret, TAG, "gpio_isr_handler_add failed: %s", esp_err_to_name(ret));
 
-    ESP_LOGI(TAG, "Button initialized..");
-}
+    mbuttonTimer = xTimerCreate("BtnTmr",               // Just a text name, not used by the RTOS kernel
+                                pdMS_TO_TICKS(50),      // timer period
+                                false,                  // no timer reload (==one-shot)
+                                (void *) (int) gpioNum, // init timer id = gpioNum index
+                                TimerCallback           // timer callback handler (all buttons use
+                                                        // the same timer cn function)
+    );
 
-void Button::SetButtonPressCallback(ButtonPressCallback button_callback)
+    return ESP_OK;
+}
+void Button::TimerCallback(TimerHandle_t xTimer)
 {
-    if (button_callback != nullptr)
-    {
-        button_press_handler = button_callback;
-    }
+    // Get the button index of the expired timer and call button event Handler.
+    uint32_t gpio_num = (uint32_t) pvTimerGetTimerID(xTimer);
+    GetAppTask().ButtonEventHandler(gpio_num, APP_BUTTON_PRESSED);
 }
diff --git a/examples/lighting-app/esp32/main/CMakeLists.txt b/examples/lighting-app/esp32/main/CMakeLists.txt
index 450a47f7db3fee..fcedfb4774637e 100644
--- a/examples/lighting-app/esp32/main/CMakeLists.txt
+++ b/examples/lighting-app/esp32/main/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2021 Project CHIP Authors
+#    Copyright (c) 2021-2023 Project CHIP Authors
 #    All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -85,6 +85,10 @@ set(SRC_DIRS_LIST  "${SRC_DIRS_LIST}"
 )
 endif (CONFIG_ENABLE_PW_RPC)
 
+if ("${CONFIG_DEVICE_TYPE_M5STACK}" STREQUAL "y")
+    list(APPEND PRIV_REQUIRES_LIST tft screen-framework)
+endif()
+
 idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
                        SRC_DIRS ${SRC_DIRS_LIST}
                        PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
diff --git a/examples/lighting-app/esp32/main/DeviceCallbacks.cpp b/examples/lighting-app/esp32/main/DeviceCallbacks.cpp
index 46983fdf441cd4..dcaaa187186b9e 100644
--- a/examples/lighting-app/esp32/main/DeviceCallbacks.cpp
+++ b/examples/lighting-app/esp32/main/DeviceCallbacks.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2021-2023 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,17 +15,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-/**
- * @file DeviceCallbacks.cpp
- *
- * Implements all the callbacks to the application from the CHIP Stack
- *
- **/
-
 #include "AppTask.h"
 
 #include "DeviceCallbacks.h"
+#include "Globals.h"
 #include "LEDWidget.h"
 
 #include <app/util/util.h>
@@ -147,3 +140,13 @@ void emberAfOnOffClusterInitCallback(EndpointId endpoint)
     ESP_LOGI(TAG, "emberAfOnOffClusterInitCallback");
     GetAppTask().UpdateClusterState();
 }
+
+void AppDeviceCallbacksDelegate::OnIPv4ConnectivityEstablished()
+{
+    wifiLED.Set(true);
+}
+
+void AppDeviceCallbacksDelegate::OnIPv4ConnectivityLost()
+{
+    wifiLED.Set(false);
+}
diff --git a/examples/lighting-app/esp32/main/DeviceWithDisplay.cpp b/examples/lighting-app/esp32/main/DeviceWithDisplay.cpp
new file mode 100644
index 00000000000000..bbca9845d0662d
--- /dev/null
+++ b/examples/lighting-app/esp32/main/DeviceWithDisplay.cpp
@@ -0,0 +1,224 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    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.
+ */
+
+#include "DeviceWithDisplay.h"
+
+#if CONFIG_HAVE_DISPLAY
+
+#include "Globals.h"
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <setup_payload/QRCodeSetupPayloadGenerator.h>
+
+using namespace ::chip;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceManager;
+using namespace ::chip::DeviceLayer;
+
+static const char * TAG = "DeviceWithDisplay";
+
+#if CONFIG_DEVICE_TYPE_M5STACK
+
+Button gButtons[BUTTON_NUMBER] = { Button(BUTTON_1_GPIO_NUM), Button(BUTTON_2_GPIO_NUM), Button(BUTTON_3_GPIO_NUM) };
+
+class ActionListModel : public ListScreen::Model
+{
+    int GetItemCount() override { return static_cast<int>(mActions.size()); }
+    std::string GetItemText(int i) override { return mActions[i].title.c_str(); }
+    void ItemAction(int i) override
+    {
+        ESP_LOGI(TAG, "generic action %d", i);
+        mActions[i].action();
+    }
+
+protected:
+    void AddAction(const char * name, std::function<void(void)> action) { mActions.push_back(Action(name, action)); }
+
+private:
+    struct Action
+    {
+        std::string title;
+        std::function<void(void)> action;
+
+        Action(const char * t, std::function<void(void)> a) : title(t), action(a) {}
+    };
+
+    std::vector<Action> mActions;
+};
+
+class MdnsDebugListModel : public ActionListModel
+{
+public:
+    std::string GetTitle() override { return "mDNS Debug"; }
+
+    MdnsDebugListModel() { AddAction("(Re-)Init", std::bind(&MdnsDebugListModel::DoReinit, this)); }
+
+private:
+    void DoReinit()
+    {
+        CHIP_ERROR err = Dnssd::ServiceAdvertiser::Instance().Init(DeviceLayer::UDPEndPointManager());
+        if (err != CHIP_NO_ERROR)
+        {
+            ESP_LOGE(TAG, "Error initializing: %s", err.AsString());
+        }
+    }
+};
+
+class TouchesMatterStackModel : public ListScreen::Model
+{
+    // We could override Action() and then hope focusIndex has not changed by
+    // the time our queued task runs, but it's cleaner to just capture its value
+    // now.
+    struct QueuedAction
+    {
+        QueuedAction(TouchesMatterStackModel * selfArg, int iArg) : self(selfArg), i(iArg) {}
+        TouchesMatterStackModel * self;
+        int i;
+    };
+
+    void ItemAction(int i) final
+    {
+        auto * action = chip::Platform::New<QueuedAction>(this, i);
+        chip::DeviceLayer::PlatformMgr().ScheduleWork(QueuedActionHandler, reinterpret_cast<intptr_t>(action));
+    }
+
+    static void QueuedActionHandler(intptr_t closure)
+    {
+        auto * queuedAction = reinterpret_cast<QueuedAction *>(closure);
+        queuedAction->self->DoAction(queuedAction->i);
+        chip::Platform::Delete(queuedAction);
+    }
+
+    virtual void DoAction(int i) = 0;
+};
+
+class SetupListModel : public TouchesMatterStackModel
+{
+public:
+    SetupListModel()
+    {
+        std::string resetWiFi                   = "Reset WiFi";
+        std::string resetToFactory              = "Reset to factory";
+        std::string forceWiFiCommissioningBasic = "Force WiFi commissioning (basic)";
+        options.emplace_back(resetWiFi);
+        options.emplace_back(resetToFactory);
+        options.emplace_back(forceWiFiCommissioningBasic);
+    }
+    virtual std::string GetTitle() { return "Setup"; }
+    virtual int GetItemCount() { return options.size(); }
+    virtual std::string GetItemText(int i) { return options.at(i); }
+    void DoAction(int i) override
+    {
+        ESP_LOGI(TAG, "Opening options %d: %s", i, GetItemText(i).c_str());
+        if (i == 0)
+        {
+            ConnectivityMgr().ClearWiFiStationProvision();
+            chip::Server::GetInstance().GetFabricTable().DeleteAllFabrics();
+            chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow();
+        }
+        else if (i == 1)
+        {
+            chip::Server::GetInstance().ScheduleFactoryReset();
+        }
+        else if (i == 2)
+        {
+            chip::Server::GetInstance().GetFabricTable().DeleteAllFabrics();
+            auto & commissionMgr = chip::Server::GetInstance().GetCommissioningWindowManager();
+            commissionMgr.OpenBasicCommissioningWindow(commissionMgr.MaxCommissioningTimeout(),
+                                                       CommissioningWindowAdvertisement::kDnssdOnly);
+        }
+    }
+
+private:
+    std::vector<std::string> options;
+};
+
+esp_err_t InitM5Stack(std::string qrCodeText)
+{
+    esp_err_t err;
+    // Initialize the buttons.
+    err = gpio_install_isr_service(0);
+    ESP_RETURN_ON_ERROR(err, TAG, "Button preInit failed: %s", esp_err_to_name(err));
+    for (int i = 0; i < BUTTON_NUMBER; ++i)
+    {
+        err = gButtons[i].Init();
+        ESP_RETURN_ON_ERROR(err, TAG, "Button.Init() failed: %s", esp_err_to_name(err));
+    }
+    // Push a rudimentary user interface.
+    ScreenManager::PushScreen(chip::Platform::New<ListScreen>(
+        (chip::Platform::New<SimpleListModel>())
+            ->Title("CHIP")
+            ->Action([](int i) { ESP_LOGI(TAG, "action on item %d", i); })
+            ->Item("mDNS Debug",
+                   []() {
+                       ESP_LOGI(TAG, "Opening MDNS debug");
+                       ScreenManager::PushScreen(chip::Platform::New<ListScreen>(chip::Platform::New<MdnsDebugListModel>()));
+                   })
+            ->Item("QR Code",
+                   [=]() {
+                       ESP_LOGI(TAG, "Opening QR code screen");
+                       PrintOnboardingCodes(chip::RendezvousInformationFlags(CONFIG_RENDEZVOUS_MODE));
+                       ScreenManager::PushScreen(chip::Platform::New<QRCodeScreen>(qrCodeText));
+                   })
+            ->Item("Setup",
+                   [=]() {
+                       ESP_LOGI(TAG, "Opening Setup list");
+                       ScreenManager::PushScreen(chip::Platform::New<ListScreen>(chip::Platform::New<SetupListModel>()));
+                   })
+            ->Item("Status", [=]() {
+                ESP_LOGI(TAG, "Opening Status screen");
+                ScreenManager::PushScreen(chip::Platform::New<StatusScreen>());
+            })));
+    return ESP_OK;
+}
+#endif
+
+void InitDeviceDisplay()
+{
+    // Create buffer for QR code that can fit max size and null terminator.
+    char qrCodeBuffer[chip::QRCodeBasicSetupPayloadGenerator::kMaxQRCodeBase38RepresentationLength + 1];
+    chip::MutableCharSpan qrCodeText(qrCodeBuffer);
+
+    // Get QR Code and emulate its content using NFC tag
+    GetQRCode(qrCodeText, chip::RendezvousInformationFlags(CONFIG_RENDEZVOUS_MODE));
+
+    // Initialize the display device.
+    esp_err_t err = InitDisplay();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "InitDisplay() failed: %s", esp_err_to_name(err));
+        return;
+    }
+
+    // Initialize the screen manager
+    ScreenManager::Init();
+    wifiLED.SetVLED(ScreenManager::AddVLED(TFT_GREEN));
+
+#if CONFIG_DEVICE_TYPE_M5STACK
+
+    InitM5Stack(qrCodeText.data());
+
+#elif CONFIG_DEVICE_TYPE_ESP32_WROVER_KIT
+
+    // Display the QR Code
+    QRCodeScreen qrCodeScreen(qrCodeText.data());
+    qrCodeScreen.Display();
+
+#endif
+}
+#endif
diff --git a/examples/lighting-app/esp32/main/DeviceWithDisplay.h b/examples/lighting-app/esp32/main/DeviceWithDisplay.h
new file mode 100644
index 00000000000000..82feb8dbf841b6
--- /dev/null
+++ b/examples/lighting-app/esp32/main/DeviceWithDisplay.h
@@ -0,0 +1,52 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    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.
+ */
+
+#pragma once
+
+#include "Button.h"
+#include "DeviceCallbacks.h"
+#include "Display.h"
+#include "ListScreen.h"
+#include "QRCodeScreen.h"
+#include "ScreenManager.h"
+#include "StatusScreen.h"
+#include "esp_check.h"
+#include "esp_log.h"
+#include "esp_system.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include <string>
+#include <vector>
+
+#if CONFIG_HAVE_DISPLAY
+
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/server/Dnssd.h>
+#include <app/server/OnboardingCodesUtil.h>
+#include <app/server/Server.h>
+
+#if CONFIG_DEVICE_TYPE_M5STACK
+#define BUTTON_1_GPIO_NUM ((gpio_num_t) 39) // Left button on M5Stack
+#define BUTTON_2_GPIO_NUM ((gpio_num_t) 38) // Middle button on M5Stack
+#define BUTTON_3_GPIO_NUM ((gpio_num_t) 37) // Right button on M5Stack
+
+esp_err_t InitM5Stack(std::string qrCodeText);
+#endif
+
+void InitDeviceDisplay();
+#endif
diff --git a/examples/all-clusters-app/esp32/main/include/OpenThreadLaunch.h b/examples/lighting-app/esp32/main/Globals.cpp
similarity index 83%
rename from examples/all-clusters-app/esp32/main/include/OpenThreadLaunch.h
rename to examples/lighting-app/esp32/main/Globals.cpp
index 86b02d6328fdb5..4c0f82bf564efc 100644
--- a/examples/all-clusters-app/esp32/main/include/OpenThreadLaunch.h
+++ b/examples/lighting-app/esp32/main/Globals.cpp
@@ -1,6 +1,7 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,6 +16,6 @@
  *    limitations under the License.
  */
 
-#pragma once
+#include "Globals.h"
 
-void LaunchOpenThread();
+WiFiWidget wifiLED;
diff --git a/examples/lighting-app/esp32/main/Kconfig.projbuild b/examples/lighting-app/esp32/main/Kconfig.projbuild
index b41b4ef0e4fb81..5f3c88166c6dda 100644
--- a/examples/lighting-app/esp32/main/Kconfig.projbuild
+++ b/examples/lighting-app/esp32/main/Kconfig.projbuild
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2021 Project CHIP Authors
+#    Copyright (c) 2021-2023 Project CHIP Authors
 #    All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,6 +38,9 @@ menu "Demo"
         config DEVICE_TYPE_ESP32_WROVER_KIT
             bool "ESP32-WROVER-KIT_V4.1"
             depends on IDF_TARGET_ESP32
+        config DEVICE_TYPE_M5STACK
+            bool "M5Stack"
+            depends on IDF_TARGET_ESP32
         config DEVICE_TYPE_ESP32_C3_DEVKITM
             bool "ESP32C3-DevKitM"
             depends on IDF_TARGET_ESP32C3
@@ -82,6 +85,7 @@ menu "Demo"
         default 26 if DEVICE_TYPE_ESP32_WROVER_KIT
         default 8 if DEVICE_TYPE_ESP32_C3_DEVKITM || DEVICE_TYPE_ESP32H2_DEVKITC || DEVICE_TYPE_ESP32_C2_DEVKITM
         default 48 if DEVICE_TYPE_ESP32_S3_DEVKITM
+        default 5 if DEVICE_TYPE_M5STACK
         default 5
         help
             GPIO number (IOxx) to blink on and off or the RMT signal for the addressable LED.
@@ -102,6 +106,17 @@ menu "Demo"
           bool "Ethernet"
     endchoice
 
+    # NOTE: This config is not displayed as a input in the Kconfig menu, as its value is
+    # entirely derived from the Device Type choice.  However the CONFIG_EXAMPLE_DISPLAY_TYPE
+    # define that is produced is needed to configure the TFT library correctly.
+    config TFT_PREDEFINED_DISPLAY_TYPE
+        int
+        range 0 5
+        default 0 if DEVICE_TYPE_ESP32_DEVKITC
+        default 0 if DEVICE_TYPE_ESP32_C3_DEVKITM || DEVICE_TYPE_ESP32_C2_DEVKITM
+        default 3 if DEVICE_TYPE_M5STACK
+        default 4 if DEVICE_TYPE_ESP32_WROVER_KIT
+
     config RENDEZVOUS_MODE
        int
        range 0 8
@@ -110,6 +125,13 @@ menu "Demo"
        default 4 if RENDEZVOUS_MODE_THREAD
        default 8 if RENDEZVOUS_MODE_ETHERNET
 
+    config DISPLAY_AUTO_OFF
+        bool "Automatically turn off the M5Stack's Display after a few seconds"
+        default "y"
+        depends on DEVICE_TYPE_M5STACK
+        help
+            To reduce wear and heat the M5Stack's Display is automatically switched off after a few seconds
+
 endmenu
 
 menu "PW RPC Debug channel"
diff --git a/examples/lighting-app/esp32/main/LEDWidget.cpp b/examples/lighting-app/esp32/main/LEDWidget.cpp
index 6e65bec7c0c1e5..246b0cec8d2b2d 100644
--- a/examples/lighting-app/esp32/main/LEDWidget.cpp
+++ b/examples/lighting-app/esp32/main/LEDWidget.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2021-2023 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.
@@ -17,6 +17,7 @@
 
 #include "LEDWidget.h"
 #include "ColorFormat.h"
+#include "ScreenManager.h"
 #include "led_strip.h"
 
 static const char * TAG = "LEDWidget";
@@ -126,11 +127,27 @@ void LEDWidget::DoSet(void)
         mStrip->refresh(mStrip, 100);
     }
 #else
-    ESP_LOGI(TAG, "DoSet to GPIO number %d", mGPIONum);
     if (mGPIONum < GPIO_NUM_MAX)
     {
         ledc_set_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, brightness);
         ledc_update_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0);
     }
 #endif // CONFIG_LED_TYPE_RMT
+#if CONFIG_HAVE_DISPLAY
+    if (mVirtualLEDIndex != -1)
+    {
+        ScreenManager::SetVLED(mVirtualLEDIndex, mState);
+    }
+#endif // CONFIG_HAVE_DISPLAY
+}
+
+#if CONFIG_DEVICE_TYPE_M5STACK
+void LEDWidget::SetVLED(int id1)
+{
+    mVirtualLEDIndex = id1;
+    if (mVirtualLEDIndex != -1)
+    {
+        ScreenManager::SetVLED(mVirtualLEDIndex, mState);
+    }
 }
+#endif
diff --git a/examples/lighting-app/esp32/main/QRCodeScreen.cpp b/examples/lighting-app/esp32/main/QRCodeScreen.cpp
new file mode 100644
index 00000000000000..d4113c4d0889b9
--- /dev/null
+++ b/examples/lighting-app/esp32/main/QRCodeScreen.cpp
@@ -0,0 +1,100 @@
+/*
+ *
+ *    Copyright (c) 2020-2023 Project CHIP Authors
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    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.
+ */
+
+/**
+ * @file QRCodeScreen.cpp
+ *
+ * Screen which displays a QR code.
+ *
+ */
+
+#include "QRCodeScreen.h"
+
+#if CONFIG_HAVE_DISPLAY
+
+// TODO organize includes below
+
+#include "esp_log.h"
+#include "esp_system.h"
+#include "esp_wifi.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
+#include "qrcodegen.h"
+
+#include <lib/support/CodeUtils.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <setup_payload/QRCodeSetupPayloadGenerator.h>
+
+namespace {
+
+constexpr int kVersion    = 4;
+constexpr int kModuleSize = 4;
+constexpr int kBorderSize = 1;
+
+color_t qrCodeColor = TFT_LIGHTGREY;
+
+}; // namespace
+
+QRCodeScreen::QRCodeScreen(std::string text, std::string title) : title(title)
+{
+    constexpr int qrCodeSize = qrcodegen_BUFFER_LEN_FOR_VERSION(kVersion);
+
+    // TODO check text length against max size permitted, or maybe adjust version used accordingly
+
+    std::vector<uint8_t> temp(qrCodeSize);
+    qrCode.resize(qrCodeSize);
+
+    if (!qrcodegen_encodeText(text.c_str(), temp.data(), qrCode.data(), qrcodegen_Ecc_LOW, kVersion, kVersion, qrcodegen_Mask_AUTO,
+                              true))
+    {
+        ESP_LOGE("QRCodeScreen", "qrcodegen_encodeText() failed");
+        qrCode.clear();
+    }
+}
+
+void QRCodeScreen::Display()
+{
+    if (qrCode.empty())
+    {
+        return;
+    }
+
+    const uint8_t * data  = qrCode.data();
+    const int size        = qrcodegen_getSize(data);
+    const int displaySize = (2 * kBorderSize + size) * kModuleSize;
+    const int displayX    = (DisplayWidth - displaySize) / 2;
+    const int displayY    = ScreenTitleSafeTop + ((DisplayHeight - ScreenTitleSafeTop - ScreenTitleSafeBottom) - displaySize) / 2;
+
+    TFT_fillRect(displayX, displayY, displaySize, displaySize, qrCodeColor);
+
+    for (int y = 0; y < size; ++y)
+    {
+        for (int x = 0; x < size; ++x)
+        {
+            if (qrcodegen_getModule(data, x, y))
+            {
+                TFT_fillRect(displayX + (kBorderSize + x) * kModuleSize, displayY + (kBorderSize + y) * kModuleSize, kModuleSize,
+                             kModuleSize, TFT_BLACK);
+            }
+        }
+    }
+}
+
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/lighting-app/esp32/main/StatusScreen.cpp b/examples/lighting-app/esp32/main/StatusScreen.cpp
new file mode 100644
index 00000000000000..698a12d835ce06
--- /dev/null
+++ b/examples/lighting-app/esp32/main/StatusScreen.cpp
@@ -0,0 +1,189 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    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.
+ */
+
+/**
+ * @file StatusScreen.cpp
+ *
+ * Screen which displays device state and status:
+ *      - Fabric Index : none | #
+ *      - Fabric ID : none | #
+ *      - Node ID : none | #
+ *      - UDP Port : #
+ *      - IPv4 : none | addr
+ *      - IPv6 LL : none | addr
+ *      - IPv6 ULA : none | addr
+ */
+
+#include "StatusScreen.h"
+
+#if CONFIG_HAVE_DISPLAY
+
+#include "esp_log.h"
+#include "esp_system.h"
+#include "esp_wifi.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
+#include <lib/support/CodeUtils.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include <app/server/Server.h>
+#include <lib/core/DataModelTypes.h>
+
+#define MAX_LENGTH_SMALL_FONT 30
+
+using namespace chip;
+
+class StatusListModel : public ListScreen::Model
+{
+public:
+    enum
+    {
+        kStatusItemFabricIndex,
+        kStatusItemFabricId,
+        kStatusItemNodeId,
+        kStatusItemPort,
+        kStatusItemIp4,
+        kStatusItemIp6LinkLocal,
+        kStatusItemIp6Ula,
+    };
+
+    StatusListModel()
+    {
+        options.emplace_back("FabricIndex : none");
+        options.emplace_back("FabricID : none");
+        options.emplace_back("NodeID : none");
+        options.emplace_back("UDP port : " + std::to_string(CHIP_PORT));
+        options.emplace_back("IPv4 : none");
+        options.emplace_back("IPv6 LL : none");
+        options.emplace_back("IPv6 ULA : none");
+    }
+
+    virtual std::string GetTitle() { return "Status"; }
+
+    virtual int GetItemCount() { return options.size(); }
+    virtual std::string GetItemText(int i)
+    {
+        std::string itemString = options.at(i);
+        switch (i)
+        {
+        case kStatusItemFabricIndex: {
+            for (const auto & fb : Server::GetInstance().GetFabricTable())
+            {
+                FabricIndex fabricIndex = fb.GetFabricIndex();
+                itemString              = "FabricIdx : " + std::to_string(fabricIndex);
+                break; // Only print first fabric for now
+            }
+            break;
+        }
+
+        case kStatusItemFabricId: {
+            for (const auto & fb : Server::GetInstance().GetFabricTable())
+            {
+                FabricId fabricId = fb.GetFabricId();
+                itemString        = "FabricID : " + std::to_string(fabricId);
+                break; // Only print first fabric for now
+            }
+            break;
+        }
+
+        case kStatusItemNodeId: {
+            for (const auto & fb : Server::GetInstance().GetFabricTable())
+            {
+                NodeId nodeId = fb.GetNodeId();
+                itemString    = "NodeID : " + std::to_string(nodeId);
+                break; // Only print first fabric for now
+            }
+            break;
+        }
+
+        case kStatusItemIp4: {
+            chip::Inet::IPAddress addr;
+            for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next())
+            {
+                if ((it.GetAddress(addr) == CHIP_NO_ERROR) && addr.IsIPv4())
+                {
+                    char buf[Inet::IPAddress::kMaxStringLength];
+                    addr.ToString(buf);
+                    itemString = std::string(buf);
+                    break; // Only print first IPv4 address for now
+                }
+            }
+            break;
+        }
+
+        case kStatusItemIp6LinkLocal: {
+            chip::Inet::IPAddress addr;
+            for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next())
+            {
+                if ((it.GetAddress(addr) == CHIP_NO_ERROR) && addr.IsIPv6LinkLocal())
+                {
+                    char buf[Inet::IPAddress::kMaxStringLength];
+                    addr.ToString(buf);
+                    itemString = std::string(buf);
+                    if (itemString.length() < MAX_LENGTH_SMALL_FONT)
+                    {
+                        TFT_setFont(SMALL_FONT, nullptr);
+                    }
+                    else
+                    {
+                        TFT_setFont(DEF_SMALL_FONT, nullptr);
+                    }
+                    break; // Only print first IPv6 LL for now
+                }
+            }
+            break;
+        }
+
+        case kStatusItemIp6Ula: {
+            chip::Inet::IPAddress addr;
+            for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next())
+            {
+                if ((it.GetAddress(addr) == CHIP_NO_ERROR) && addr.IsIPv6ULA())
+                {
+                    char buf[Inet::IPAddress::kMaxStringLength];
+                    addr.ToString(buf);
+                    itemString = std::string(buf);
+                    if (itemString.length() < MAX_LENGTH_SMALL_FONT)
+                    {
+                        TFT_setFont(SMALL_FONT, nullptr);
+                    }
+                    else
+                    {
+                        TFT_setFont(DEF_SMALL_FONT, nullptr);
+                    }
+                    break; // Only print first IPv6 ULA for now
+                }
+            }
+            break;
+        }
+        }
+        ESP_LOGI("M5 UI", "Display status %d: %s", i, itemString.c_str());
+
+        return itemString;
+    }
+
+    virtual void ItemAction(int i) {}
+
+private:
+    std::vector<std::string> options;
+};
+
+StatusScreen::StatusScreen() : ListScreen(chip::Platform::New<StatusListModel>()) {}
+
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/lighting-app/esp32/main/WiFiWidget.cpp b/examples/lighting-app/esp32/main/WiFiWidget.cpp
new file mode 100644
index 00000000000000..4062cc68e237c7
--- /dev/null
+++ b/examples/lighting-app/esp32/main/WiFiWidget.cpp
@@ -0,0 +1,66 @@
+/*
+ *
+ *    Copyright (c) 2020-2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    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.
+ */
+
+/**
+ * @file WiFiWidget.cpp
+ *
+ * Implements a WiFi Widget controller that display the state of bluetooth
+ * connection on display.
+ */
+
+#include "ScreenManager.h"
+
+#include "WiFiWidget.h"
+
+#include "esp_log.h"
+#include "esp_system.h"
+
+void WiFiWidget::Init()
+{
+#if CONFIG_HAVE_DISPLAY
+    mVLED = -1;
+#endif // CONFIG_HAVE_DISPLAY
+
+    mState = false;
+}
+
+void WiFiWidget::Set(bool state)
+{
+    bool stateChange = (mState != state);
+    mState           = state;
+    if (stateChange)
+    {
+#if CONFIG_HAVE_DISPLAY
+        if (mVLED != -1)
+        {
+            ScreenManager::SetVLED(mVLED, mState);
+        }
+#endif // CONFIG_HAVE_DISPLAY
+    }
+}
+
+#if CONFIG_HAVE_DISPLAY
+void WiFiWidget::SetVLED(int id)
+{
+    mVLED = id;
+    if (mVLED != -1)
+    {
+        ScreenManager::SetVLED(mVLED, mState);
+    }
+}
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/lighting-app/esp32/main/include/AppEvent.h b/examples/lighting-app/esp32/main/include/AppEvent.h
index 65ebd7aedc8157..079109e6fac770 100644
--- a/examples/lighting-app/esp32/main/include/AppEvent.h
+++ b/examples/lighting-app/esp32/main/include/AppEvent.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright (c) 2022-2023 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,6 +38,7 @@ struct AppEvent
         struct
         {
             uint8_t Action;
+            uint8_t PinNo;
         } ButtonEvent;
         struct
         {
diff --git a/examples/lighting-app/esp32/main/include/AppTask.h b/examples/lighting-app/esp32/main/include/AppTask.h
index 9271ebd3499b44..a7ba9387395316 100644
--- a/examples/lighting-app/esp32/main/include/AppTask.h
+++ b/examples/lighting-app/esp32/main/include/AppTask.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright (c) 2022-2023 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,7 +57,9 @@ class AppTask
     static void SwitchActionEventHandler(AppEvent * aEvent);
     static void LightingActionEventHandler(AppEvent * aEvent);
 
-    static void ButtonPressCallback();
+#if CONFIG_DEVICE_TYPE_M5STACK
+    static void ButtonPressedAction(AppEvent * aEvent);
+#endif
 
     static AppTask sAppTask;
 };
diff --git a/examples/lighting-app/esp32/main/include/Button.h b/examples/lighting-app/esp32/main/include/Button.h
index 17a08d7c1a9496..1251633630e7b5 100644
--- a/examples/lighting-app/esp32/main/include/Button.h
+++ b/examples/lighting-app/esp32/main/include/Button.h
@@ -1,6 +1,7 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2022-2023 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -14,17 +15,38 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 #pragma once
 
 #include "driver/gpio.h"
 #include "esp_log.h"
+#include "esp_system.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/timers.h"
 
+#define APP_BUTTON_PRESSED 0
+#define APP_BUTTON_RELEASED 1
+#define BUTTON_NUMBER 3
 class Button
 {
 public:
-    typedef void (*ButtonPressCallback)(void);
+    Button();
+    Button(gpio_num_t gpioNum);
+
+    esp_err_t Init();
+    esp_err_t Init(gpio_num_t gpioNum);
+
+    inline gpio_num_t GetGPIONum();
+    static void TimerCallback(TimerHandle_t xTimer);
 
-    void Init(void);
-    void SetButtonPressCallback(ButtonPressCallback button_callback);
+    friend void IRAM_ATTR button_isr_handler(void * arg);
+
+private:
+    gpio_num_t mGPIONum;
+    TimerHandle_t mbuttonTimer; // FreeRTOS timers used for debouncing buttons
 };
+
+inline gpio_num_t Button::GetGPIONum()
+{
+    return mGPIONum;
+}
diff --git a/examples/lighting-app/esp32/main/include/DeviceCallbacks.h b/examples/lighting-app/esp32/main/include/DeviceCallbacks.h
index 05933202b8c22a..e45a3b21f712bf 100644
--- a/examples/lighting-app/esp32/main/include/DeviceCallbacks.h
+++ b/examples/lighting-app/esp32/main/include/DeviceCallbacks.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2021-2023 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +15,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-/**
- * @file DeviceCallbacks.h
- *
- * Implementations for the DeviceManager callbacks for this application
- *
- **/
-
 #pragma once
 
 #include <app/util/af-types.h>
@@ -44,3 +36,10 @@ class AppDeviceCallbacks : public CommonDeviceCallbacks
     void OnColorControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
 #endif
 };
+
+class AppDeviceCallbacksDelegate : public DeviceCallbacksDelegate
+{
+public:
+    void OnIPv4ConnectivityEstablished() override;
+    void OnIPv4ConnectivityLost() override;
+};
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/OpenThreadLaunch.h b/examples/lighting-app/esp32/main/include/Globals.h
similarity index 82%
rename from examples/all-clusters-minimal-app/esp32/main/include/OpenThreadLaunch.h
rename to examples/lighting-app/esp32/main/include/Globals.h
index 86b02d6328fdb5..c26aa66edc7f7d 100644
--- a/examples/all-clusters-minimal-app/esp32/main/include/OpenThreadLaunch.h
+++ b/examples/lighting-app/esp32/main/include/Globals.h
@@ -1,6 +1,7 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2020-2023 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,4 +18,6 @@
 
 #pragma once
 
-void LaunchOpenThread();
+#include "WiFiWidget.h"
+
+extern WiFiWidget wifiLED;
diff --git a/examples/lighting-app/esp32/main/include/LEDWidget.h b/examples/lighting-app/esp32/main/include/LEDWidget.h
index c390d63ac1024f..a230ae3451353e 100644
--- a/examples/lighting-app/esp32/main/include/LEDWidget.h
+++ b/examples/lighting-app/esp32/main/include/LEDWidget.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2021-2023 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.
@@ -43,6 +43,11 @@ class LEDWidget
     uint8_t GetLevel(void);
     bool IsTurnedOn(void);
 
+#if CONFIG_DEVICE_TYPE_M5STACK
+    // binds this LED to a virtual LED on a screen
+    void SetVLED(int id1);
+#endif
+
 private:
     bool mState;
     uint8_t mBrightness;
@@ -55,5 +60,9 @@ class LEDWidget
     gpio_num_t mGPIONum;
 #endif
 
+#if CONFIG_DEVICE_TYPE_M5STACK
+    int mVirtualLEDIndex = -1;
+#endif
+
     void DoSet(void);
 };
diff --git a/examples/lighting-app/esp32/main/include/QRCodeScreen.h b/examples/lighting-app/esp32/main/include/QRCodeScreen.h
new file mode 100644
index 00000000000000..f82ad33d8e35b2
--- /dev/null
+++ b/examples/lighting-app/esp32/main/include/QRCodeScreen.h
@@ -0,0 +1,42 @@
+/*
+ *
+ *    Copyright (c) 2020-2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    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.
+ */
+
+#pragma once
+
+#include "Screen.h"
+#include "ScreenManager.h"
+
+#if CONFIG_HAVE_DISPLAY
+
+#include <cstdint>
+#include <vector>
+
+class QRCodeScreen : public Screen
+{
+    std::vector<uint8_t> qrCode;
+    std::string title;
+
+public:
+    QRCodeScreen(std::string text, std::string title = "QR Code");
+
+    virtual std::string GetTitle() { return title; }
+
+    virtual void Display();
+};
+
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/lighting-app/esp32/main/include/StatusScreen.h b/examples/lighting-app/esp32/main/include/StatusScreen.h
new file mode 100644
index 00000000000000..3aa537ebf0b9ba
--- /dev/null
+++ b/examples/lighting-app/esp32/main/include/StatusScreen.h
@@ -0,0 +1,38 @@
+/*
+ *
+ *    Copyright (c) 2022-2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    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.
+ */
+
+#pragma once
+
+#include "ListScreen.h"
+#include "ScreenManager.h"
+
+#if CONFIG_HAVE_DISPLAY
+
+#include <cstdint>
+#include <vector>
+
+class StatusScreen : public ListScreen
+{
+
+public:
+    StatusScreen();
+
+    virtual ~StatusScreen() {}
+};
+
+#endif // CONFIG_HAVE_DISPLAY
diff --git a/examples/lighting-app/esp32/main/include/WiFiWidget.h b/examples/lighting-app/esp32/main/include/WiFiWidget.h
new file mode 100644
index 00000000000000..cbc128c5ddfca9
--- /dev/null
+++ b/examples/lighting-app/esp32/main/include/WiFiWidget.h
@@ -0,0 +1,36 @@
+/*
+ *
+ *    Copyright (c) 2020-2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    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.
+ */
+
+#pragma once
+
+#include "Display.h"
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
+class WiFiWidget
+{
+public:
+    void Init();
+    void Set(bool state);
+    void SetVLED(int id);
+
+private:
+    int mVLED;
+    bool mState;
+};
diff --git a/examples/lighting-app/esp32/main/main.cpp b/examples/lighting-app/esp32/main/main.cpp
index 6e3aaf367f8512..0d0244b7e00059 100644
--- a/examples/lighting-app/esp32/main/main.cpp
+++ b/examples/lighting-app/esp32/main/main.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2021-2023 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.
@@ -36,6 +36,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <platform/ESP32/ESP32Utils.h>
 
 #if CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
 #include <platform/ESP32/ESP32FactoryDataProvider.h>
@@ -45,6 +46,8 @@
 #include "Rpc.h"
 #endif
 
+#include "DeviceWithDisplay.h"
+
 #if CONFIG_ENABLE_ESP32_DEVICE_INFO_PROVIDER
 #include <platform/ESP32/ESP32DeviceInfoProvider.h>
 #else
@@ -59,6 +62,7 @@ using namespace ::chip::DeviceLayer;
 static const char * TAG = "light-app";
 
 static AppDeviceCallbacks EchoCallbacks;
+static AppDeviceCallbacksDelegate sAppDeviceCallbacksDelegate;
 
 namespace {
 #if CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
@@ -77,6 +81,7 @@ static void InitServer(intptr_t context)
     // Print QR Code URL
     PrintOnboardingCodes(chip::RendezvousInformationFlags(CONFIG_RENDEZVOUS_MODE));
 
+    DeviceCallbacksDelegate::Instance().SetAppDelegate(&sAppDeviceCallbacksDelegate);
     Esp32AppServer::Init(); // Init ZCL Data Model and CHIP App Server AND Initialize device attestation config
 }
 
@@ -89,6 +94,12 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
         return;
     }
+    err = esp_event_loop_create_default();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "esp_event_loop_create_default() failed: %s", esp_err_to_name(err));
+        return;
+    }
 #if CONFIG_ENABLE_PW_RPC
     chip::rpc::Init();
 #endif
@@ -100,6 +111,13 @@ extern "C" void app_main()
 #if CONFIG_ENABLE_CHIP_SHELL
     chip::LaunchShell();
 #endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize WiFi stack");
+        return;
+    }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
     DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
diff --git a/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6 b/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6
new file mode 100644
index 00000000000000..7ef46707ea5c95
--- /dev/null
+++ b/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6
@@ -0,0 +1,64 @@
+CONFIG_IDF_TARGET="esp32c6"
+
+# Default to 921600 baud when flashing and monitoring device
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+
+# libsodium
+CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
+
+
+# NIMBLE
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_EXT_ADV=n
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
+
+# Disable OpenThread
+CONFIG_OPENTHREAD_ENABLED=n
+
+# Disable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=n
+
+# Use a custom partition table
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
+# LwIP config for OpenThread
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
+CONFIG_LWIP_MULTICAST_PING=y
+
+# mbedTLS
+CONFIG_MBEDTLS_HARDWARE_AES=n
+CONFIG_MBEDTLS_HARDWARE_MPI=n
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_MBEDTLS_HARDWARE_ECC=y
+CONFIG_MBEDTLS_CMAC_C=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
+
+# MDNS platform
+CONFIG_USE_MINIMAL_MDNS=y
+CONFIG_ENABLE_EXTENDED_DISCOVERY=y
+
+# FreeRTOS should use legacy API
+CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
+
+# Wi-Fi Settings
+CONFIG_ENABLE_WIFI_STATION=y
+CONFIG_ENABLE_WIFI_AP=n
+# Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
+CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
+
+# Enable OTA Requestor
+CONFIG_ENABLE_OTA_REQUESTOR=y
+
+# Enable chip shell
+CONFIG_ENABLE_CHIP_SHELL=y
diff --git a/examples/lighting-app/esp32/sdkconfig_m5stack.defaults b/examples/lighting-app/esp32/sdkconfig_m5stack.defaults
new file mode 100644
index 00000000000000..3f70ee3bfe1c46
--- /dev/null
+++ b/examples/lighting-app/esp32/sdkconfig_m5stack.defaults
@@ -0,0 +1,64 @@
+#
+#    Copyright (c) 2021-2023 Project CHIP Authors
+#    All rights reserved.
+#
+#    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.
+#
+#    Description:
+#      Some useful defaults for the demo app configuration.
+#
+CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_TARGET_ESP32=y
+CONFIG_DEVICE_TYPE_M5STACK=y
+
+# Default to 921600 baud when flashing and monitoring device
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+
+#enable BT
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+
+#disable BT connection reattempt
+CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n
+
+#enable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
+
+#enable debug shell
+CONFIG_ENABLE_CHIP_SHELL=y
+
+# Use a custom partition table
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+
+#enable lwIP route hooks
+CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
+CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
+
+# Main task needs a bit more stack than the default
+# default is 3584, bump this up to 5k.
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=5120
+
+# Serial Flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+
+# Disable softap support by default
+CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
+# This example uses the older version of RMT driver to work with both
+# idf-v4.4.3 and idf-v5.0, so supressing the warnings by setting below option
+CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
diff --git a/examples/lighting-app/silabs/SiWx917/include/CHIPProjectConfig.h b/examples/lighting-app/silabs/SiWx917/include/CHIPProjectConfig.h
index ff01045a6c6707..751ebfcff265f2 100644
--- a/examples/lighting-app/silabs/SiWx917/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/silabs/SiWx917/include/CHIPProjectConfig.h
@@ -69,17 +69,6 @@
  */
 #define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
 
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- *
- * A string identifying the software version running on the device.
- * CHIP service currently expects the software version to be in the format
- * {MAJOR_VERSION}.0d{MINOR_VERSION}
- */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
-#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "0.1ALPHA"
-#endif
-
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
  *
diff --git a/examples/lighting-app/silabs/SiWx917/src/LightingManager.cpp b/examples/lighting-app/silabs/SiWx917/src/LightingManager.cpp
index fd07e80e68401f..2c5807f4ea693e 100644
--- a/examples/lighting-app/silabs/SiWx917/src/LightingManager.cpp
+++ b/examples/lighting-app/silabs/SiWx917/src/LightingManager.cpp
@@ -52,7 +52,7 @@ CHIP_ERROR LightingManager::Init()
 {
     // Create FreeRTOS sw timer for light timer.
     sLightTimer = xTimerCreate("lightTmr",       // Just a text name, not used by the RTOS kernel
-                               1,                // == default timer period (mS)
+                               pdMS_TO_TICKS(1), // == default timer period
                                false,            // no timer reload (==one-shot)
                                (void *) this,    // init timer id = light obj context
                                TimerEventHandler // timer callback handler
@@ -164,9 +164,9 @@ void LightingManager::StartTimer(uint32_t aTimeoutMs)
     }
 
     // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
+    // FreeRTOS- Block for a maximum of 100 ms if the change period command
     // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sLightTimer, (aTimeoutMs / portTICK_PERIOD_MS), 100) != pdPASS)
+    if (xTimerChangePeriod(sLightTimer, pdMS_TO_TICKS(aTimeoutMs), pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("sLightTimer timer start() failed");
         appError(APP_ERROR_START_TIMER_FAILED);
@@ -175,7 +175,7 @@ void LightingManager::StartTimer(uint32_t aTimeoutMs)
 
 void LightingManager::CancelTimer(void)
 {
-    if (xTimerStop(sLightTimer, 0) == pdFAIL)
+    if (xTimerStop(sLightTimer, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         SILABS_LOG("sLightTimer stop() failed");
         appError(APP_ERROR_STOP_TIMER_FAILED);
diff --git a/examples/lighting-app/silabs/efr32/src/LightingManager.cpp b/examples/lighting-app/silabs/efr32/src/LightingManager.cpp
index fd07e80e68401f..2c5807f4ea693e 100644
--- a/examples/lighting-app/silabs/efr32/src/LightingManager.cpp
+++ b/examples/lighting-app/silabs/efr32/src/LightingManager.cpp
@@ -52,7 +52,7 @@ CHIP_ERROR LightingManager::Init()
 {
     // Create FreeRTOS sw timer for light timer.
     sLightTimer = xTimerCreate("lightTmr",       // Just a text name, not used by the RTOS kernel
-                               1,                // == default timer period (mS)
+                               pdMS_TO_TICKS(1), // == default timer period
                                false,            // no timer reload (==one-shot)
                                (void *) this,    // init timer id = light obj context
                                TimerEventHandler // timer callback handler
@@ -164,9 +164,9 @@ void LightingManager::StartTimer(uint32_t aTimeoutMs)
     }
 
     // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
+    // FreeRTOS- Block for a maximum of 100 ms if the change period command
     // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sLightTimer, (aTimeoutMs / portTICK_PERIOD_MS), 100) != pdPASS)
+    if (xTimerChangePeriod(sLightTimer, pdMS_TO_TICKS(aTimeoutMs), pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("sLightTimer timer start() failed");
         appError(APP_ERROR_START_TIMER_FAILED);
@@ -175,7 +175,7 @@ void LightingManager::StartTimer(uint32_t aTimeoutMs)
 
 void LightingManager::CancelTimer(void)
 {
-    if (xTimerStop(sLightTimer, 0) == pdFAIL)
+    if (xTimerStop(sLightTimer, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         SILABS_LOG("sLightTimer stop() failed");
         appError(APP_ERROR_STOP_TIMER_FAILED);
diff --git a/examples/lock-app/esp32/main/main.cpp b/examples/lock-app/esp32/main/main.cpp
index 28964b4eeceeb2..3549b83cad9c77 100644
--- a/examples/lock-app/esp32/main/main.cpp
+++ b/examples/lock-app/esp32/main/main.cpp
@@ -30,6 +30,7 @@
 #include <common/Esp32AppServer.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <platform/ESP32/ESP32Utils.h>
 
 #include <cmath>
 #include <cstdio>
@@ -92,7 +93,12 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
         return;
     }
-
+    err = esp_event_loop_create_default();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "esp_event_loop_create_default() failed: %s", esp_err_to_name(err));
+        return;
+    }
 #if CONFIG_ENABLE_PW_RPC
     chip::rpc::Init();
 #endif
@@ -100,7 +106,13 @@ extern "C" void app_main()
     ESP_LOGI(TAG, "==================================================");
     ESP_LOGI(TAG, "chip-esp32-lock-example starting");
     ESP_LOGI(TAG, "==================================================");
-
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (DeviceLayer::Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize Wi-Fi stack");
+        return;
+    }
+#endif
 #if CONFIG_ENABLE_CHIP_SHELL
     chip::LaunchShell();
 #endif
diff --git a/examples/lock-app/infineon/psoc6/include/LockManager.h b/examples/lock-app/infineon/psoc6/include/LockManager.h
index ab3eb96c0a92c6..d08cab2cc104b3 100644
--- a/examples/lock-app/infineon/psoc6/include/LockManager.h
+++ b/examples/lock-app/infineon/psoc6/include/LockManager.h
@@ -56,10 +56,8 @@ static constexpr uint8_t kMaxCredentialsPerUser      = 10;
 static constexpr uint8_t kMaxWeekdaySchedulesPerUser = 10;
 static constexpr uint8_t kMaxYeardaySchedulesPerUser = 10;
 static constexpr uint8_t kMaxHolidaySchedules        = 10;
-static constexpr uint8_t kMaxCredentialSize          = 8;
-
-// Indices received for user/credential/schedules are 1-indexed
-static constexpr uint8_t kStartIndexValue = 1;
+static constexpr uint8_t kMaxCredentialSize          = 20;
+static constexpr uint8_t kNumCredentialTypes         = 6;
 
 static constexpr uint8_t kMaxCredentials = kMaxUsers * kMaxCredentialsPerUser;
 } // namespace ResourceRanges
@@ -178,6 +176,7 @@ class LockManager
                                 uint32_t localEndTime, OperatingModeEnum operatingMode);
 
     bool IsValidUserIndex(uint16_t userIndex);
+    bool IsValidCredentialType(CredentialTypeEnum type);
     bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
     bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
@@ -205,14 +204,14 @@ class LockManager
     static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
 
     EmberAfPluginDoorLockUserInfo mLockUsers[kMaxUsers];
-    EmberAfPluginDoorLockCredentialInfo mLockCredentials[kMaxCredentials];
+    EmberAfPluginDoorLockCredentialInfo mLockCredentials[kNumCredentialTypes][kMaxCredentials];
     WeekDaysScheduleInfo mWeekdaySchedule[kMaxUsers][kMaxWeekdaySchedulesPerUser];
     YearDayScheduleInfo mYeardaySchedule[kMaxUsers][kMaxYeardaySchedulesPerUser];
     HolidayScheduleInfo mHolidaySchedule[kMaxHolidaySchedules];
 
     char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
-    uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize];
-    CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
+    uint8_t mCredentialData[kNumCredentialTypes][kMaxCredentials][kMaxCredentialSize];
+    CredentialStruct mCredentials[kMaxUsers][kMaxCredentials];
 
     static LockManager sLock;
     P6DoorLock::LockInitParams::LockParam LockParams;
diff --git a/examples/lock-app/infineon/psoc6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp
index 1a695da5dc8511..b5bd7a4edf2dcf 100644
--- a/examples/lock-app/infineon/psoc6/src/AppTask.cpp
+++ b/examples/lock-app/infineon/psoc6/src/AppTask.cpp
@@ -283,7 +283,8 @@ void AppTask::lockMgr_Init()
     }
 
     ConfigurationMgr().LogDeviceConfig();
-
+    // Users and credentials should be checked once from flash on boot
+    LockMgr().ReadConfigValues();
     // Print setup info
     PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
 }
@@ -323,9 +324,6 @@ void AppTask::AppTaskMain(void * pvParameter)
     sAppTask.Init();
     P6_LOG("App Task started");
 
-    // Users and credentials should be checked once from flash on boot
-    LockMgr().ReadConfigValues();
-
     while (true)
     {
         BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY);
diff --git a/examples/lock-app/infineon/psoc6/src/LockManager.cpp b/examples/lock-app/infineon/psoc6/src/LockManager.cpp
index 06de91f664a827..764ee16ee61c56 100644
--- a/examples/lock-app/infineon/psoc6/src/LockManager.cpp
+++ b/examples/lock-app/infineon/psoc6/src/LockManager.cpp
@@ -118,6 +118,11 @@ bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTyp
     return (credentialIndex < kMaxCredentialsPerUser);
 }
 
+bool LockManager::IsValidCredentialType(CredentialTypeEnum type)
+{
+    return (to_underlying(type) < kNumCredentialTypes);
+}
+
 bool LockManager::IsValidWeekdayScheduleIndex(uint8_t scheduleIndex)
 {
     return (scheduleIndex < kMaxWeekdaySchedulesPerUser);
@@ -140,7 +145,7 @@ bool LockManager::ReadConfigValues()
                                  sizeof(EmberAfPluginDoorLockUserInfo) * ArraySize(mLockUsers), outLen);
 
     P6Config::ReadConfigValueBin(P6Config::kConfigKey_Credential, reinterpret_cast<uint8_t *>(&mLockCredentials),
-                                 sizeof(EmberAfPluginDoorLockCredentialInfo) * ArraySize(mLockCredentials), outLen);
+                                 sizeof(EmberAfPluginDoorLockCredentialInfo) * kMaxCredentials * kNumCredentialTypes, outLen);
 
     P6Config::ReadConfigValueBin(P6Config::kConfigKey_LockUserName, reinterpret_cast<uint8_t *>(mUserNames), sizeof(mUserNames),
                                  outLen);
@@ -149,8 +154,7 @@ bool LockManager::ReadConfigValues()
                                  sizeof(mCredentialData), outLen);
 
     P6Config::ReadConfigValueBin(P6Config::kConfigKey_UserCredentials, reinterpret_cast<uint8_t *>(mCredentials),
-                                 sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser,
-                                 outLen);
+                                 sizeof(CredentialStruct) * LockParams.numberOfUsers * kMaxCredentials, outLen);
 
     P6Config::ReadConfigValueBin(P6Config::kConfigKey_WeekDaySchedules, reinterpret_cast<uint8_t *>(mWeekdaySchedule),
                                  sizeof(EmberAfPluginDoorLockWeekDaySchedule) * LockParams.numberOfWeekdaySchedulesPerUser *
@@ -384,11 +388,6 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
     for (size_t i = 0; i < totalCredentials; ++i)
     {
         mCredentials[userIndex][i] = credentials[i];
-        // TODO: Why are we modifying the passed-in credentials?
-        // https://github.com/project-chip/connectedhomeip/issues/25081
-        // For now, preserve pre-existing behavior, which set credentialType to 1.
-        mCredentials[userIndex][i].credentialType  = CredentialTypeEnum::kPin;
-        mCredentials[userIndex][i].credentialIndex = i + 1;
     }
 
     userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
@@ -398,7 +397,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
                                   sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers);
 
     P6Config::WriteConfigValueBin(P6Config::kConfigKey_UserCredentials, reinterpret_cast<const uint8_t *>(mCredentials),
-                                  sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
+                                  sizeof(CredentialStruct) * LockParams.numberOfUsers * kMaxCredentials);
 
     P6Config::WriteConfigValueBin(P6Config::kConfigKey_LockUserName, reinterpret_cast<const uint8_t *>(mUserNames),
                                   sizeof(mUserNames));
@@ -411,25 +410,21 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
 bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                 EmberAfPluginDoorLockCredentialInfo & credential)
 {
-
-    VerifyOrReturnValue(credentialIndex > 0, false); // indices are one-indexed
-
-    credentialIndex--;
-
-    VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType), false);
+    VerifyOrReturnValue(IsValidCredentialType(credentialType), false);
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
+    {
+        VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
+                            false); // programming pin index is only index allowed to contain 0
+    }
+    else
+    {
+        VerifyOrReturnValue(IsValidCredentialIndex(--credentialIndex, credentialType), false); // otherwise, indices are one-indexed
+    }
 
     ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u], credentialIndex=%d",
                     to_underlying(credentialType), credentialIndex);
 
-    if (credentialType == CredentialTypeEnum::kProgrammingPIN)
-    {
-        ChipLogError(Zcl, "Programming user not supported [credentialType=%u], credentialIndex=%d", to_underlying(credentialType),
-                     credentialIndex);
-
-        return true;
-    }
-
-    const auto & credentialInStorage = mLockCredentials[credentialIndex];
+    const auto & credentialInStorage = mLockCredentials[to_underlying(credentialType)][credentialIndex];
 
     credential.status = credentialInStorage.status;
     ChipLogDetail(Zcl, "CredentialStatus: %d, CredentialIndex: %d ", (int) credential.status, credentialIndex);
@@ -458,31 +453,36 @@ bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credential
                                 chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                 const chip::ByteSpan & credentialData)
 {
-
-    VerifyOrReturnValue(credentialIndex > 0, false); // indices are one-indexed
-
-    credentialIndex--;
-
-    VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType), false);
+    VerifyOrReturnValue(IsValidCredentialType(credentialType), false);
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
+    {
+        VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
+                            false); // programming pin index is only index allowed to contain 0
+    }
+    else
+    {
+        VerifyOrReturnValue(IsValidCredentialIndex(--credentialIndex, credentialType), false); // otherwise, indices are one-indexed
+    }
 
     ChipLogProgress(Zcl,
                     "Door Lock App: LockManager::SetCredential "
                     "[credentialStatus=%u,credentialType=%u,credentialDataSize=%u,creator=%d,modifier=%d]",
                     to_underlying(credentialStatus), to_underlying(credentialType), credentialData.size(), creator, modifier);
 
-    auto & credentialInStorage = mLockCredentials[credentialIndex];
+    auto & credentialInStorage = mLockCredentials[to_underlying(credentialType)][credentialIndex];
 
     credentialInStorage.status         = credentialStatus;
     credentialInStorage.credentialType = credentialType;
     credentialInStorage.createdBy      = creator;
     credentialInStorage.lastModifiedBy = modifier;
 
-    memcpy(mCredentialData[credentialIndex], credentialData.data(), credentialData.size());
-    credentialInStorage.credentialData = chip::ByteSpan{ mCredentialData[credentialIndex], credentialData.size() };
+    memcpy(mCredentialData[to_underlying(credentialType)][credentialIndex], credentialData.data(), credentialData.size());
+    credentialInStorage.credentialData =
+        chip::ByteSpan{ mCredentialData[to_underlying(credentialType)][credentialIndex], credentialData.size() };
 
     // Save credential information in NVM flash
     P6Config::WriteConfigValueBin(P6Config::kConfigKey_Credential, reinterpret_cast<const uint8_t *>(&mLockCredentials),
-                                  sizeof(EmberAfPluginDoorLockCredentialInfo) * LockParams.numberOfCredentialsPerUser);
+                                  sizeof(EmberAfPluginDoorLockCredentialInfo) * kMaxCredentials * kNumCredentialTypes);
 
     P6Config::WriteConfigValueBin(P6Config::kConfigKey_CredentialData, reinterpret_cast<const uint8_t *>(&mCredentialData),
                                   sizeof(mCredentialData));
@@ -686,15 +686,15 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
     }
 
     // Check the PIN code
-    for (uint8_t i = 0; i < kMaxCredentials; i++)
+    for (const auto & currentCredential : mLockCredentials[to_underlying(CredentialTypeEnum::kPin)])
     {
-        if (mLockCredentials[i].credentialType != CredentialTypeEnum::kPin ||
-            mLockCredentials[i].status == DlCredentialStatus::kAvailable)
+
+        if (currentCredential.status == DlCredentialStatus::kAvailable)
         {
             continue;
         }
 
-        if (mLockCredentials[i].credentialData.data_equal(pin.Value()))
+        if (currentCredential.credentialData.data_equal(pin.Value()))
         {
             ChipLogDetail(Zcl,
                           "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]",
diff --git a/examples/lock-app/silabs/SiWx917/include/LockManager.h b/examples/lock-app/silabs/SiWx917/include/LockManager.h
index 1158a333a0c54f..e9754984b446fa 100644
--- a/examples/lock-app/silabs/SiWx917/include/LockManager.h
+++ b/examples/lock-app/silabs/SiWx917/include/LockManager.h
@@ -175,6 +175,7 @@ class LockManager
 
     bool IsValidUserIndex(uint16_t userIndex);
     bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
+    bool IsValidCredentialType(CredentialTypeEnum type);
     bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex);
diff --git a/examples/lock-app/silabs/SiWx917/src/LockManager.cpp b/examples/lock-app/silabs/SiWx917/src/LockManager.cpp
index 1d227128f72258..b9a8f9db2f515c 100644
--- a/examples/lock-app/silabs/SiWx917/src/LockManager.cpp
+++ b/examples/lock-app/silabs/SiWx917/src/LockManager.cpp
@@ -79,7 +79,7 @@ CHIP_ERROR LockManager::Init(chip::app::DataModel::Nullable<chip::app::Clusters:
 
     // Create FreeRTOS sw timer for lock timer.
     sLockTimer = xTimerCreate("lockTmr",        // Just a text name, not used by the RTOS kernel
-                              1,                // == default timer period (mS)
+                              pdMS_TO_TICKS(1), // == default timer period
                               false,            // no timer reload (==one-shot)
                               (void *) this,    // init timer id = lock obj context
                               TimerEventHandler // timer callback handler
@@ -113,6 +113,11 @@ bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTyp
     return (credentialIndex < kMaxCredentialsPerUser);
 }
 
+bool LockManager::IsValidCredentialType(CredentialTypeEnum type)
+{
+    return (to_underlying(type) < kNumCredentialTypes);
+}
+
 bool LockManager::IsValidWeekdayScheduleIndex(uint8_t scheduleIndex)
 {
     return (scheduleIndex < kMaxWeekdaySchedulesPerUser);
@@ -134,9 +139,8 @@ bool LockManager::ReadConfigValues()
     SilabsConfig::ReadConfigValueBin(SilabsConfig::kConfigKey_LockUser, reinterpret_cast<uint8_t *>(&mLockUsers),
                                      sizeof(EmberAfPluginDoorLockUserInfo) * ArraySize(mLockUsers), outLen);
 
-    SilabsConfig::ReadConfigValueBin(
-        SilabsConfig::kConfigKey_Credential, reinterpret_cast<uint8_t *>(&mLockCredentials),
-        sizeof(EmberAfPluginDoorLockCredentialInfo) * LockParams.numberOfCredentialsPerUser * kNumCredentialTypes, outLen);
+    SilabsConfig::ReadConfigValueBin(SilabsConfig::kConfigKey_Credential, reinterpret_cast<uint8_t *>(&mLockCredentials),
+                                     sizeof(EmberAfPluginDoorLockCredentialInfo) * kMaxCredentials * kNumCredentialTypes, outLen);
 
     SilabsConfig::ReadConfigValueBin(SilabsConfig::kConfigKey_LockUserName, reinterpret_cast<uint8_t *>(mUserNames),
                                      sizeof(mUserNames), outLen);
@@ -225,9 +229,9 @@ void LockManager::StartTimer(uint32_t aTimeoutMs)
     }
 
     // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
+    // FreeRTOS- Block for a maximum of 100 ms if the change period command
     // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sLockTimer, (aTimeoutMs / portTICK_PERIOD_MS), 100) != pdPASS)
+    if (xTimerChangePeriod(sLockTimer, pdMS_TO_TICKS(aTimeoutMs), pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("sLockTimer timer start() failed");
         appError(APP_ERROR_START_TIMER_FAILED);
@@ -236,7 +240,7 @@ void LockManager::StartTimer(uint32_t aTimeoutMs)
 
 void LockManager::CancelTimer(void)
 {
-    if (xTimerStop(sLockTimer, 0) == pdFAIL)
+    if (xTimerStop(sLockTimer, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         SILABS_LOG("sLockTimer stop() failed");
         appError(APP_ERROR_STOP_TIMER_FAILED);
@@ -379,9 +383,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
 
     for (size_t i = 0; i < totalCredentials; ++i)
     {
-        mCredentials[userIndex][i]                 = credentials[i];
-        mCredentials[userIndex][i].credentialType  = credentials[i].credentialType;
-        mCredentials[userIndex][i].credentialIndex = credentials[i].credentialIndex;
+        mCredentials[userIndex][i] = credentials[i];
     }
 
     userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
@@ -405,6 +407,8 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
                                 EmberAfPluginDoorLockCredentialInfo & credential)
 {
 
+    VerifyOrReturnValue(IsValidCredentialType(credentialType), false);
+
     if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
@@ -448,6 +452,8 @@ bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credential
                                 const chip::ByteSpan & credentialData)
 {
 
+    VerifyOrReturnValue(IsValidCredentialType(credentialType), false);
+
     if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
@@ -476,8 +482,7 @@ bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credential
 
     // Save credential information in NVM flash
     SilabsConfig::WriteConfigValueBin(SilabsConfig::kConfigKey_Credential, reinterpret_cast<const uint8_t *>(&mLockCredentials),
-                                      sizeof(EmberAfPluginDoorLockCredentialInfo) * LockParams.numberOfCredentialsPerUser *
-                                          kNumCredentialTypes);
+                                      sizeof(EmberAfPluginDoorLockCredentialInfo) * kMaxCredentials * kNumCredentialTypes);
 
     SilabsConfig::WriteConfigValueBin(SilabsConfig::kConfigKey_CredentialData, reinterpret_cast<const uint8_t *>(&mCredentialData),
                                       sizeof(mCredentialData));
@@ -682,15 +687,15 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
     }
 
     // Check the PIN code
-    for (uint8_t i = 0; i < kMaxCredentialsPerUser; i++)
+    for (const auto & currentCredential : mLockCredentials[to_underlying(CredentialTypeEnum::kPin)])
     {
 
-        if (mLockCredentials[to_underlying(CredentialTypeEnum::kPin)][i].status == DlCredentialStatus::kAvailable)
+        if (currentCredential.status == DlCredentialStatus::kAvailable)
         {
             continue;
         }
 
-        if (mLockCredentials[to_underlying(CredentialTypeEnum::kPin)][i].credentialData.data_equal(pin.Value()))
+        if (currentCredential.credentialData.data_equal(pin.Value()))
         {
             ChipLogDetail(Zcl,
                           "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]",
diff --git a/examples/lock-app/silabs/efr32/include/LockManager.h b/examples/lock-app/silabs/efr32/include/LockManager.h
index a6177b7100ca62..fcc03abdce0f5d 100644
--- a/examples/lock-app/silabs/efr32/include/LockManager.h
+++ b/examples/lock-app/silabs/efr32/include/LockManager.h
@@ -58,6 +58,8 @@ static constexpr uint8_t kMaxHolidaySchedules        = 10;
 static constexpr uint8_t kMaxCredentialSize          = 20;
 static constexpr uint8_t kNumCredentialTypes         = 6;
 
+static constexpr uint8_t kMaxCredentials = kMaxUsers * kMaxCredentialsPerUser;
+
 } // namespace ResourceRanges
 
 namespace LockInitParams {
@@ -175,6 +177,7 @@ class LockManager
 
     bool IsValidUserIndex(uint16_t userIndex);
     bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
+    bool IsValidCredentialType(CredentialTypeEnum type);
     bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex);
@@ -200,14 +203,14 @@ class LockManager
     static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
 
     EmberAfPluginDoorLockUserInfo mLockUsers[kMaxUsers];
-    EmberAfPluginDoorLockCredentialInfo mLockCredentials[kNumCredentialTypes][kMaxCredentialsPerUser];
+    EmberAfPluginDoorLockCredentialInfo mLockCredentials[kNumCredentialTypes][kMaxCredentials];
     WeekDaysScheduleInfo mWeekdaySchedule[kMaxUsers][kMaxWeekdaySchedulesPerUser];
     YearDayScheduleInfo mYeardaySchedule[kMaxUsers][kMaxYeardaySchedulesPerUser];
     HolidayScheduleInfo mHolidaySchedule[kMaxHolidaySchedules];
 
     char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
-    uint8_t mCredentialData[kNumCredentialTypes][kMaxCredentialsPerUser][kMaxCredentialSize];
-    CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
+    uint8_t mCredentialData[kNumCredentialTypes][kMaxCredentials][kMaxCredentialSize];
+    CredentialStruct mCredentials[kMaxUsers][kMaxCredentials];
 
     static LockManager sLock;
     EFR32DoorLock::LockInitParams::LockParam LockParams;
diff --git a/examples/lock-app/silabs/efr32/src/LockManager.cpp b/examples/lock-app/silabs/efr32/src/LockManager.cpp
index 51b7f034a27b0d..c0f0797e7e6eed 100644
--- a/examples/lock-app/silabs/efr32/src/LockManager.cpp
+++ b/examples/lock-app/silabs/efr32/src/LockManager.cpp
@@ -79,7 +79,7 @@ CHIP_ERROR LockManager::Init(chip::app::DataModel::Nullable<chip::app::Clusters:
 
     // Create FreeRTOS sw timer for lock timer.
     sLockTimer = xTimerCreate("lockTmr",        // Just a text name, not used by the RTOS kernel
-                              1,                // == default timer period (mS)
+                              1,                // == default timer period
                               false,            // no timer reload (==one-shot)
                               (void *) this,    // init timer id = lock obj context
                               TimerEventHandler // timer callback handler
@@ -113,6 +113,11 @@ bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTyp
     return (credentialIndex < kMaxCredentialsPerUser);
 }
 
+bool LockManager::IsValidCredentialType(CredentialTypeEnum type)
+{
+    return (to_underlying(type) < kNumCredentialTypes);
+}
+
 bool LockManager::IsValidWeekdayScheduleIndex(uint8_t scheduleIndex)
 {
     return (scheduleIndex < kMaxWeekdaySchedulesPerUser);
@@ -134,9 +139,8 @@ bool LockManager::ReadConfigValues()
     SilabsConfig::ReadConfigValueBin(SilabsConfig::kConfigKey_LockUser, reinterpret_cast<uint8_t *>(&mLockUsers),
                                      sizeof(EmberAfPluginDoorLockUserInfo) * ArraySize(mLockUsers), outLen);
 
-    SilabsConfig::ReadConfigValueBin(
-        SilabsConfig::kConfigKey_Credential, reinterpret_cast<uint8_t *>(&mLockCredentials),
-        sizeof(EmberAfPluginDoorLockCredentialInfo) * LockParams.numberOfCredentialsPerUser * kNumCredentialTypes, outLen);
+    SilabsConfig::ReadConfigValueBin(SilabsConfig::kConfigKey_Credential, reinterpret_cast<uint8_t *>(&mLockCredentials),
+                                     sizeof(EmberAfPluginDoorLockCredentialInfo) * kMaxCredentials * kNumCredentialTypes, outLen);
 
     SilabsConfig::ReadConfigValueBin(SilabsConfig::kConfigKey_LockUserName, reinterpret_cast<uint8_t *>(mUserNames),
                                      sizeof(mUserNames), outLen);
@@ -225,9 +229,9 @@ void LockManager::StartTimer(uint32_t aTimeoutMs)
     }
 
     // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
+    // FreeRTOS- Block for a maximum of 100 ms if the change period command
     // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sLockTimer, (aTimeoutMs / portTICK_PERIOD_MS), 100) != pdPASS)
+    if (xTimerChangePeriod(sLockTimer, pdMS_TO_TICKS(aTimeoutMs), pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("sLockTimer timer start() failed");
         appError(APP_ERROR_START_TIMER_FAILED);
@@ -236,7 +240,7 @@ void LockManager::StartTimer(uint32_t aTimeoutMs)
 
 void LockManager::CancelTimer(void)
 {
-    if (xTimerStop(sLockTimer, 0) == pdFAIL)
+    if (xTimerStop(sLockTimer, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         SILABS_LOG("sLockTimer stop() failed");
         appError(APP_ERROR_STOP_TIMER_FAILED);
@@ -379,9 +383,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
 
     for (size_t i = 0; i < totalCredentials; ++i)
     {
-        mCredentials[userIndex][i]                 = credentials[i];
-        mCredentials[userIndex][i].credentialType  = credentials[i].credentialType;
-        mCredentials[userIndex][i].credentialIndex = credentials[i].credentialIndex;
+        mCredentials[userIndex][i] = credentials[i];
     }
 
     userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
@@ -405,6 +407,8 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
                                 EmberAfPluginDoorLockCredentialInfo & credential)
 {
 
+    VerifyOrReturnValue(IsValidCredentialType(credentialType), false);
+
     if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
@@ -448,6 +452,8 @@ bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credential
                                 const chip::ByteSpan & credentialData)
 {
 
+    VerifyOrReturnValue(IsValidCredentialType(credentialType), false);
+
     if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
@@ -476,8 +482,7 @@ bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credential
 
     // Save credential information in NVM flash
     SilabsConfig::WriteConfigValueBin(SilabsConfig::kConfigKey_Credential, reinterpret_cast<const uint8_t *>(&mLockCredentials),
-                                      sizeof(EmberAfPluginDoorLockCredentialInfo) * LockParams.numberOfCredentialsPerUser *
-                                          kNumCredentialTypes);
+                                      sizeof(EmberAfPluginDoorLockCredentialInfo) * kMaxCredentials * kNumCredentialTypes);
 
     SilabsConfig::WriteConfigValueBin(SilabsConfig::kConfigKey_CredentialData, reinterpret_cast<const uint8_t *>(&mCredentialData),
                                       sizeof(mCredentialData));
@@ -682,15 +687,15 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
     }
 
     // Check the PIN code
-    for (uint8_t i = 0; i < kMaxCredentialsPerUser; i++)
+    for (const auto & currentCredential : mLockCredentials[to_underlying(CredentialTypeEnum::kPin)])
     {
 
-        if (mLockCredentials[to_underlying(CredentialTypeEnum::kPin)][i].status == DlCredentialStatus::kAvailable)
+        if (currentCredential.status == DlCredentialStatus::kAvailable)
         {
             continue;
         }
 
-        if (mLockCredentials[to_underlying(CredentialTypeEnum::kPin)][i].credentialData.data_equal(pin.Value()))
+        if (currentCredential.credentialData.data_equal(pin.Value()))
         {
             ChipLogDetail(Zcl,
                           "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]",
diff --git a/examples/ota-provider-app/esp32/main/main.cpp b/examples/ota-provider-app/esp32/main/main.cpp
index 2a0f4d6e9bcc3c..d016149f5b436b 100644
--- a/examples/ota-provider-app/esp32/main/main.cpp
+++ b/examples/ota-provider-app/esp32/main/main.cpp
@@ -27,6 +27,7 @@
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #include <lib/support/logging/CHIPLogging.h>
+#include <platform/ESP32/ESP32Utils.h>
 
 #include <OTAProviderCommands.h>
 #include <app/clusters/ota-provider/ota-provider.h>
@@ -244,6 +245,19 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
         return;
     }
+    err = esp_event_loop_create_default();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "esp_event_loop_create_default() failed: %s", esp_err_to_name(err));
+        return;
+    }
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (DeviceLayer::Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize Wi-Fi stack");
+        return;
+    }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
     DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
diff --git a/examples/ota-requestor-app/esp32/main/main.cpp b/examples/ota-requestor-app/esp32/main/main.cpp
index 099984b86af621..a962d7c236a51e 100644
--- a/examples/ota-requestor-app/esp32/main/main.cpp
+++ b/examples/ota-requestor-app/esp32/main/main.cpp
@@ -32,6 +32,7 @@
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #include <ota/OTAHelper.h>
+#include <platform/ESP32/ESP32Utils.h>
 #include <shell_extension/launch.h>
 
 #include "OTAImageProcessorImpl.h"
@@ -133,12 +134,25 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
         return;
     }
+    err = esp_event_loop_create_default();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "esp_event_loop_create_default() failed: %s", esp_err_to_name(err));
+        return;
+    }
 
 #if CONFIG_ENABLE_CHIP_SHELL
     chip::LaunchShell();
     OTARequestorCommands::GetInstance().Register();
 #endif // CONFIG_ENABLE_CHIP_SHELL
 
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (DeviceLayer::Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize Wi-Fi stack");
+        return;
+    }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
     DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
     CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
diff --git a/examples/platform/bouffalolab/common/plat/uart.c b/examples/platform/bouffalolab/common/plat/uart.c
index b51c39d49083f5..8f2742f0296f5b 100644
--- a/examples/platform/bouffalolab/common/plat/uart.c
+++ b/examples/platform/bouffalolab/common/plat/uart.c
@@ -51,15 +51,14 @@ static int uartTxCallback(void * p_arg)
 
 static int uartRxCallback(void * p_arg)
 {
-    uint32_t len = 0, readlen = 0;
+    uint32_t len                        = 0;
     BaseType_t xHigherPriorityTaskWoken = 1;
 
     if (chipUart_var.head >= chipUart_var.tail)
     {
         if (chipUart_var.head < MAX_BUFFER_SIZE)
         {
-            readlen = len =
-                hosal_uart_receive(&uart_stdio, chipUart_var.rxbuf + chipUart_var.head, MAX_BUFFER_SIZE - chipUart_var.head);
+            len = hosal_uart_receive(&uart_stdio, chipUart_var.rxbuf + chipUart_var.head, MAX_BUFFER_SIZE - chipUart_var.head);
             chipUart_var.head = (chipUart_var.head + len) % MAX_BUFFER_SIZE;
         }
 
@@ -67,17 +66,15 @@ static int uartRxCallback(void * p_arg)
         {
             len = hosal_uart_receive(&uart_stdio, chipUart_var.rxbuf, chipUart_var.tail - 1);
             chipUart_var.head += len;
-            readlen += len;
         }
     }
     else
     {
-        readlen =
+        chipUart_var.head +=
             hosal_uart_receive(&uart_stdio, chipUart_var.rxbuf + chipUart_var.head, chipUart_var.tail - chipUart_var.head - 1);
-        chipUart_var.head += readlen;
     }
 
-    if (0 == readlen || (chipUart_var.head + 1) % MAX_BUFFER_SIZE == chipUart_var.tail)
+    if (chipUart_var.head != chipUart_var.tail)
     {
         xSemaphoreGiveFromISR(chipUart_var.sema, &xHigherPriorityTaskWoken);
     }
diff --git a/examples/platform/esp32/common/CommonDeviceCallbacks.cpp b/examples/platform/esp32/common/CommonDeviceCallbacks.cpp
index be0fbf1255cce6..4a112aef9ed7f0 100644
--- a/examples/platform/esp32/common/CommonDeviceCallbacks.cpp
+++ b/examples/platform/esp32/common/CommonDeviceCallbacks.cpp
@@ -46,9 +46,6 @@ using namespace chip::DeviceLayer;
 using namespace chip::System;
 
 DeviceCallbacksDelegate * appDelegate = nullptr;
-#if CONFIG_ENABLE_OTA_REQUESTOR
-static bool isOTAInitialized = false;
-#endif
 
 void CommonDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
 {
@@ -66,14 +63,15 @@ void CommonDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, i
         ESP_LOGI(TAG, "CHIPoBLE disconnected");
         break;
 
-    case DeviceEventType::kThreadConnectivityChange:
+    case DeviceEventType::kDnssdInitialized:
 #if CONFIG_ENABLE_OTA_REQUESTOR
-        if (event->ThreadConnectivityChange.Result == kConnectivity_Established && !isOTAInitialized)
+        OTAHelpers::Instance().InitOTARequestor();
+#endif
+        appDelegate = DeviceCallbacksDelegate::Instance().GetAppDelegate();
+        if (appDelegate != nullptr)
         {
-            OTAHelpers::Instance().InitOTARequestor();
-            isOTAInitialized = true;
+            appDelegate->OnDnssdInitialized();
         }
-#endif
         break;
 
     case DeviceEventType::kCommissioningComplete: {
@@ -136,13 +134,6 @@ void CommonDeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent *
             appDelegate->OnIPv4ConnectivityEstablished();
         }
         chip::app::DnssdServer::Instance().StartServer();
-#if CONFIG_ENABLE_OTA_REQUESTOR
-        if (!isOTAInitialized)
-        {
-            OTAHelpers::Instance().InitOTARequestor();
-            isOTAInitialized = true;
-        }
-#endif
     }
     else if (event->InternetConnectivityChange.IPv4 == kConnectivity_Lost)
     {
@@ -156,14 +147,6 @@ void CommonDeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent *
     {
         ESP_LOGI(TAG, "IPv6 Server ready...");
         chip::app::DnssdServer::Instance().StartServer();
-
-#if CONFIG_ENABLE_OTA_REQUESTOR
-        if (!isOTAInitialized)
-        {
-            OTAHelpers::Instance().InitOTARequestor();
-            isOTAInitialized = true;
-        }
-#endif
     }
     else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
     {
diff --git a/examples/platform/esp32/common/CommonDeviceCallbacks.h b/examples/platform/esp32/common/CommonDeviceCallbacks.h
index a87014cbf00858..f76cdc405aa80e 100644
--- a/examples/platform/esp32/common/CommonDeviceCallbacks.h
+++ b/examples/platform/esp32/common/CommonDeviceCallbacks.h
@@ -40,6 +40,7 @@ class DeviceCallbacksDelegate
     }
     virtual void OnIPv4ConnectivityEstablished() {}
     virtual void OnIPv4ConnectivityLost() {}
+    virtual void OnDnssdInitialized() {}
     DeviceCallbacksDelegate * mDelegate = nullptr;
     void SetAppDelegate(DeviceCallbacksDelegate * delegate) { mDelegate = delegate; }
     DeviceCallbacksDelegate * GetAppDelegate() { return mDelegate; }
diff --git a/examples/platform/esp32/ota/OTAHelper.cpp b/examples/platform/esp32/ota/OTAHelper.cpp
index b2be750db337c9..cd4cfe90dea17d 100644
--- a/examples/platform/esp32/ota/OTAHelper.cpp
+++ b/examples/platform/esp32/ota/OTAHelper.cpp
@@ -56,28 +56,25 @@ bool CustomOTARequestorDriver::CanConsent()
     return gRequestorCanConsent.ValueOr(DeviceLayer::ExtendedOTARequestorDriver::CanConsent());
 }
 
-static void InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
+void OTAHelpers::InitOTARequestor()
 {
-    SetRequestorInstance(&gRequestorCore);
-    gRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-    gRequestorCore.Init(Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
-    gImageProcessor.SetOTADownloader(&gDownloader);
-    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
-    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
-
-    if (gUserConsentState != chip::ota::UserConsentState::kUnknown)
+    if (!GetRequestorInstance())
     {
-        gUserConsentProvider.SetUserConsentState(gUserConsentState);
-        gRequestorUser.SetUserConsentDelegate(&gUserConsentProvider);
+        SetRequestorInstance(&gRequestorCore);
+        gRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
+        gRequestorCore.Init(Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
+        gImageProcessor.SetOTADownloader(&gDownloader);
+        gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+        gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
+
+        if (gUserConsentState != chip::ota::UserConsentState::kUnknown)
+        {
+            gUserConsentProvider.SetUserConsentState(gUserConsentState);
+            gRequestorUser.SetUserConsentDelegate(&gUserConsentProvider);
+        }
     }
 }
 
-void OTAHelpers::InitOTARequestor()
-{
-    chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Seconds32(kInitOTARequestorDelaySec), InitOTARequestorHandler,
-                                                nullptr);
-}
-
 namespace chip {
 namespace Shell {
 namespace {
diff --git a/examples/platform/silabs/Rpc.cpp b/examples/platform/silabs/Rpc.cpp
index 0973049db2521e..e3c1fed77ecf84 100644
--- a/examples/platform/silabs/Rpc.cpp
+++ b/examples/platform/silabs/Rpc.cpp
@@ -95,7 +95,7 @@ class Efr32Device final : public Device
     pw::Status Reboot(const pw_protobuf_Empty & request, pw_protobuf_Empty & response) override
     {
         mRebootTimer = xTimerCreateStatic("Reboot", kRebootTimerPeriodTicks, false, nullptr, RebootHandler, &mRebootTimerBuffer);
-        xTimerStart(mRebootTimer, 0);
+        xTimerStart(mRebootTimer, pdMS_TO_TICKS(0));
         return pw::OkStatus();
     }
 
diff --git a/examples/platform/silabs/SiWx917/BaseApplication.cpp b/examples/platform/silabs/SiWx917/BaseApplication.cpp
index c1d01571bee971..2c937c90691b69 100644
--- a/examples/platform/silabs/SiWx917/BaseApplication.cpp
+++ b/examples/platform/silabs/SiWx917/BaseApplication.cpp
@@ -177,7 +177,7 @@ CHIP_ERROR BaseApplication::Init(Identify * identifyObj)
 
     // Create FreeRTOS sw timer for Function Selection.
     sFunctionTimer = xTimerCreate("FnTmr",                  // Just a text name, not used by the RTOS kernel
-                                  1,                        // == default timer period (mS)
+                                  pdMS_TO_TICKS(1),         // == default timer period
                                   false,                    // no timer reload (==one-shot)
                                   (void *) this,            // init timer id = app task obj context
                                   FunctionTimerEventHandler // timer callback handler
@@ -190,7 +190,7 @@ CHIP_ERROR BaseApplication::Init(Identify * identifyObj)
 
     // Create FreeRTOS sw timer for LED Management.
     sLightTimer = xTimerCreate("LightTmr",            // Text Name
-                               10,                    // Default timer period (mS)
+                               pdMS_TO_TICKS(10),     // Default timer period
                                true,                  // reload timer
                                (void *) this,         // Timer Id
                                LightTimerEventHandler // Timer callback handler
@@ -426,7 +426,7 @@ void BaseApplication::ButtonHandler(AppEvent * aEvent)
 
 void BaseApplication::CancelFunctionTimer()
 {
-    if (xTimerStop(sFunctionTimer, 0) == pdFAIL)
+    if (xTimerStop(sFunctionTimer, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         SILABS_LOG("app timer stop() failed");
         appError(APP_ERROR_STOP_TIMER_FAILED);
@@ -444,9 +444,9 @@ void BaseApplication::StartFunctionTimer(uint32_t aTimeoutInMs)
     }
 
     // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
+    // FreeRTOS- Block for a maximum of 100 ms if the change period command
     // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sFunctionTimer, aTimeoutInMs / portTICK_PERIOD_MS, 100) != pdPASS)
+    if (xTimerChangePeriod(sFunctionTimer, pdMS_TO_TICKS(aTimeoutInMs), pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("app timer start() failed");
         appError(APP_ERROR_START_TIMER_FAILED);
@@ -457,7 +457,7 @@ void BaseApplication::StartFunctionTimer(uint32_t aTimeoutInMs)
 
 void BaseApplication::StartStatusLEDTimer()
 {
-    if (pdPASS != xTimerStart(sLightTimer, 0))
+    if (pdPASS != xTimerStart(sLightTimer, pdMS_TO_TICKS(0)))
     {
         SILABS_LOG("Light Time start failed");
         appError(APP_ERROR_START_TIMER_FAILED);
@@ -470,7 +470,7 @@ void BaseApplication::StopStatusLEDTimer()
     sStatusLED.Set(false);
 #endif // ENABLE_WSTK_LEDS
 
-    if (xTimerStop(sLightTimer, 100) != pdPASS)
+    if (xTimerStop(sLightTimer, pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("Light Time start failed");
         appError(APP_ERROR_START_TIMER_FAILED);
diff --git a/examples/platform/silabs/SiWx917/SiWx917/rsi_if.c b/examples/platform/silabs/SiWx917/SiWx917/rsi_if.c
index 4197532369b0ee..e491e0f93682e5 100644
--- a/examples/platform/silabs/SiWx917/SiWx917/rsi_if.c
+++ b/examples/platform/silabs/SiWx917/SiWx917/rsi_if.c
@@ -422,6 +422,7 @@ static void wfx_rsi_save_ap_info()
 static void wfx_rsi_do_join(void)
 {
     int32_t status;
+    rsi_security_mode_t connect_security_mode;
 
     if (wfx_rsi.dev_state & (WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED))
     {
@@ -472,8 +473,8 @@ static void wfx_rsi_do_join(void)
             /* Call rsi connect call with given ssid and password
              * And check there is a success
              */
-            if ((status = rsi_wlan_connect_async((int8_t *) &wfx_rsi.sec.ssid[0], (rsi_security_mode_t) wfx_rsi.sec.security,
-                                                 &wfx_rsi.sec.passkey[0], wfx_rsi_join_cb)) != RSI_SUCCESS)
+            if ((status = rsi_wlan_connect_async((int8_t *) &wfx_rsi.sec.ssid[0], connect_security_mode, &wfx_rsi.sec.passkey[0],
+                                                 wfx_rsi_join_cb)) != RSI_SUCCESS)
             {
 
                 wfx_rsi.dev_state &= ~WFX_RSI_ST_STA_CONNECTING;
diff --git a/examples/platform/silabs/efr32/BaseApplication.cpp b/examples/platform/silabs/efr32/BaseApplication.cpp
index 285a107e8bf406..bcedcf8b2a73d9 100644
--- a/examples/platform/silabs/efr32/BaseApplication.cpp
+++ b/examples/platform/silabs/efr32/BaseApplication.cpp
@@ -183,7 +183,7 @@ CHIP_ERROR BaseApplication::Init(Identify * identifyObj)
 
     // Create FreeRTOS sw timer for Function Selection.
     sFunctionTimer = xTimerCreate("FnTmr",                  // Just a text name, not used by the RTOS kernel
-                                  1,                        // == default timer period (mS)
+                                  pdMS_TO_TICKS(1),         // == default timer period
                                   false,                    // no timer reload (==one-shot)
                                   (void *) this,            // init timer id = app task obj context
                                   FunctionTimerEventHandler // timer callback handler
@@ -196,7 +196,7 @@ CHIP_ERROR BaseApplication::Init(Identify * identifyObj)
 
     // Create FreeRTOS sw timer for LED Management.
     sLightTimer = xTimerCreate("LightTmr",            // Text Name
-                               10,                    // Default timer period (mS)
+                               pdMS_TO_TICKS(10),     // Default timer period
                                true,                  // reload timer
                                (void *) this,         // Timer Id
                                LightTimerEventHandler // Timer callback handler
@@ -463,7 +463,7 @@ void BaseApplication::ButtonHandler(AppEvent * aEvent)
 #endif
 void BaseApplication::CancelFunctionTimer()
 {
-    if (xTimerStop(sFunctionTimer, 0) == pdFAIL)
+    if (xTimerStop(sFunctionTimer, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         SILABS_LOG("app timer stop() failed");
         appError(APP_ERROR_STOP_TIMER_FAILED);
@@ -481,9 +481,9 @@ void BaseApplication::StartFunctionTimer(uint32_t aTimeoutInMs)
     }
 
     // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
+    // FreeRTOS- Block for a maximum of 100 ms if the change period command
     // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sFunctionTimer, aTimeoutInMs / portTICK_PERIOD_MS, 100) != pdPASS)
+    if (xTimerChangePeriod(sFunctionTimer, pdMS_TO_TICKS(aTimeoutInMs), pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("app timer start() failed");
         appError(APP_ERROR_START_TIMER_FAILED);
@@ -494,7 +494,7 @@ void BaseApplication::StartFunctionTimer(uint32_t aTimeoutInMs)
 
 void BaseApplication::StartStatusLEDTimer()
 {
-    if (pdPASS != xTimerStart(sLightTimer, 0))
+    if (pdPASS != xTimerStart(sLightTimer, pdMS_TO_TICKS(0)))
     {
         SILABS_LOG("Light Time start failed");
         appError(APP_ERROR_START_TIMER_FAILED);
@@ -507,7 +507,7 @@ void BaseApplication::StopStatusLEDTimer()
     sStatusLED.Set(false);
 #endif // ENABLE_WSTK_LEDS
 
-    if (xTimerStop(sLightTimer, 100) != pdPASS)
+    if (xTimerStop(sLightTimer, pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("Light Time start failed");
         appError(APP_ERROR_START_TIMER_FAILED);
diff --git a/examples/platform/silabs/efr32/FreeRTOSConfig.h b/examples/platform/silabs/efr32/FreeRTOSConfig.h
index 4c5b6febefb8cf..0511bae26b1bcc 100644
--- a/examples/platform/silabs/efr32/FreeRTOSConfig.h
+++ b/examples/platform/silabs/efr32/FreeRTOSConfig.h
@@ -140,7 +140,7 @@ extern "C" {
 #define configUSE_TICKLESS_IDLE 0
 #endif // SL_CATALOG_POWER_MANAGER_PRESENT
 
-#define configTICK_RATE_HZ (1000)
+#define configTICK_RATE_HZ (1024)
 /* Definition used by Keil to replace default system clock source. */
 #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 1
 
diff --git a/examples/platform/silabs/efr32/wf200/wf200_init.c b/examples/platform/silabs/efr32/wf200/wf200_init.c
index 12973d3c8ffb67..3631216e767a0c 100644
--- a/examples/platform/silabs/efr32/wf200/wf200_init.c
+++ b/examples/platform/silabs/efr32/wf200/wf200_init.c
@@ -320,8 +320,8 @@ sl_status_t sl_wfx_host_reset_chip(void)
  *****************************************************************************/
 sl_status_t sl_wfx_host_wait_for_wake_up(void)
 {
-    xSemaphoreTake(wfx_wakeup_sem, TICKS_TO_WAIT_0);
-    xSemaphoreTake(wfx_wakeup_sem, TICKS_TO_WAIT_3 / portTICK_PERIOD_MS);
+    xSemaphoreTake(wfx_wakeup_sem, pdMS_TO_TICKS(TICKS_TO_WAIT_0));
+    xSemaphoreTake(wfx_wakeup_sem, pdMS_TO_TICKS(TICKS_TO_WAIT_3));
 
     return SL_STATUS_OK;
 }
@@ -418,7 +418,7 @@ sl_status_t sl_wfx_host_lock(void)
 
     sl_status_t status = SL_STATUS_OK;
 
-    if (xSemaphoreTake(wfx_mutex, TICKS_TO_WAIT_500) != pdTRUE)
+    if (xSemaphoreTake(wfx_mutex, pdMS_TO_TICKS(TICKS_TO_WAIT_500)) != pdTRUE)
     {
         SILABS_LOG("*ERR*Wi-Fi driver mutex timo");
         status = SL_STATUS_TIMEOUT;
diff --git a/examples/platform/silabs/matter_shell.cpp b/examples/platform/silabs/matter_shell.cpp
index 5a7bbde945a7f9..9a59adb4306dc6 100644
--- a/examples/platform/silabs/matter_shell.cpp
+++ b/examples/platform/silabs/matter_shell.cpp
@@ -42,7 +42,7 @@ void MatterShellTask(void * args)
 
 extern "C" unsigned int sleep(unsigned int seconds)
 {
-    const TickType_t xDelay = 1000 * seconds / portTICK_PERIOD_MS;
+    const TickType_t xDelay = pdMS_TO_TICKS(1000 * seconds);
     vTaskDelay(xDelay);
     return 0;
 }
diff --git a/examples/temperature-measurement-app/esp32/main/main.cpp b/examples/temperature-measurement-app/esp32/main/main.cpp
index 2d1e2672d3a720..e1102f80b4e8f8 100644
--- a/examples/temperature-measurement-app/esp32/main/main.cpp
+++ b/examples/temperature-measurement-app/esp32/main/main.cpp
@@ -29,6 +29,7 @@
 #include <common/Esp32AppServer.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <platform/ESP32/ESP32Utils.h>
 
 #include <cmath>
 #include <cstdio>
@@ -89,8 +90,21 @@ extern "C" void app_main()
         ESP_LOGE(TAG, "nvs_flash_init() failed: %s", esp_err_to_name(err));
         return;
     }
+    err = esp_event_loop_create_default();
+    if (err != ESP_OK)
+    {
+        ESP_LOGE(TAG, "esp_event_loop_create_default() failed: %s", esp_err_to_name(err));
+        return;
+    }
 
     DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
+    if (DeviceLayer::Internal::ESP32Utils::InitWiFiStack() != CHIP_NO_ERROR)
+    {
+        ESP_LOGE(TAG, "Failed to initialize the Wi-Fi stack");
+        return;
+    }
+#endif
 
     CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
 
diff --git a/examples/tv-casting-app/android/App/.idea/gradle.xml b/examples/tv-casting-app/android/App/.idea/gradle.xml
index 526b4c25c6813e..a2d7c21338e98a 100644
--- a/examples/tv-casting-app/android/App/.idea/gradle.xml
+++ b/examples/tv-casting-app/android/App/.idea/gradle.xml
@@ -13,7 +13,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
index 5ff612685c515b..0f0529a6c70cfa 100644
--- a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
+++ b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
@@ -8,25 +8,38 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.LinearLayout;
+import android.widget.ListView;
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
 import com.chip.casting.DiscoveredNodeData;
 import com.chip.casting.FailureCallback;
 import com.chip.casting.MatterError;
 import com.chip.casting.SuccessCallback;
 import com.chip.casting.TvCastingApp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 /** A {@link Fragment} to discover commissioners on the network */
 public class CommissionerDiscoveryFragment extends Fragment {
   private static final String TAG = CommissionerDiscoveryFragment.class.getSimpleName();
-  private static final long DISCOVERY_DURATION_SECS = 10;
+  private static final long DISCOVERY_POLL_INTERVAL_MS = 15000;
+  private static final List<DiscoveredNodeData> commissionerVideoPlayerList = new ArrayList<>();
+  private FailureCallback failureCallback;
+  private SuccessCallback<DiscoveredNodeData> successCallback;
+  private ScheduledFuture poller;
   private final TvCastingApp tvCastingApp;
+  private ScheduledExecutorService executor;
 
   public CommissionerDiscoveryFragment(TvCastingApp tvCastingApp) {
     this.tvCastingApp = tvCastingApp;
+    this.executor = Executors.newSingleThreadScheduledExecutor();
   }
 
   /**
@@ -56,75 +69,126 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
 
     Button manualCommissioningButton = getView().findViewById(R.id.manualCommissioningButton);
+    // In the ideal case we wouldn't rely on the host activity to maintain this object since
+    // the lifecycle of the context isn't tied to this callback. Since this is an example app
+    // this should work fine.
     Callback callback = (Callback) this.getActivity();
     View.OnClickListener manualCommissioningButtonOnClickListener =
-        new View.OnClickListener() {
-          @Override
-          public void onClick(View v) {
-            callback.handleCommissioningButtonClicked(null);
-          }
-        };
+        v -> callback.handleCommissioningButtonClicked(null);
     manualCommissioningButton.setOnClickListener(manualCommissioningButtonOnClickListener);
 
-    Context context = this.getContext();
-    SuccessCallback<DiscoveredNodeData> successCallback =
+    ArrayAdapter<DiscoveredNodeData> arrayAdapter =
+        new VideoPlayerCommissionerAdapter(getActivity(), commissionerVideoPlayerList);
+    final ListView list = getActivity().findViewById(R.id.commissionerList);
+    list.setAdapter(arrayAdapter);
+
+    this.successCallback =
         new SuccessCallback<DiscoveredNodeData>() {
           @Override
           public void handle(DiscoveredNodeData discoveredNodeData) {
             Log.d(TAG, "Discovered a Video Player Commissioner: " + discoveredNodeData);
-            String buttonText = getCommissionerButtonText(discoveredNodeData);
-
-            if (!buttonText.isEmpty()) {
-              Button commissionerButton = new Button(context);
-              commissionerButton.setText(buttonText);
-              CommissionerDiscoveryFragment.Callback callback =
-                  (CommissionerDiscoveryFragment.Callback) getActivity();
-              commissionerButton.setOnClickListener(
-                  new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                      Log.d(
-                          TAG,
-                          "CommissionerResolveListener.onServiceResolved.OnClickListener.onClick called for "
-                              + discoveredNodeData);
-                      callback.handleCommissioningButtonClicked(discoveredNodeData);
-                    }
-                  });
-              new Handler(Looper.getMainLooper())
-                  .post(
-                      () ->
-                          ((LinearLayout) getActivity().findViewById(R.id.castingCommissioners))
-                              .addView(commissionerButton));
-            }
+            new Handler(Looper.getMainLooper())
+                .post(
+                    () -> {
+                      final Optional<DiscoveredNodeData> discoveredNodeInList =
+                          commissionerVideoPlayerList
+                              .stream()
+                              .filter(node -> discoveredNodeData.discoveredNodeHasSameSource(node))
+                              .findFirst();
+                      if (discoveredNodeInList.isPresent()) {
+                        Log.d(
+                            TAG,
+                            "Replacing existing entry "
+                                + discoveredNodeInList.get().getDeviceName()
+                                + " in players list");
+                        arrayAdapter.remove(discoveredNodeInList.get());
+                      }
+                      arrayAdapter.add(discoveredNodeData);
+                    });
           }
         };
 
-    FailureCallback failureCallback =
+    this.failureCallback =
         new FailureCallback() {
           @Override
           public void handle(MatterError matterError) {
             Log.e(TAG, "Error occurred during video player commissioner discovery: " + matterError);
+            if (MatterError.DISCOVERY_SERVICE_LOST == matterError) {
+              Log.d(TAG, "Attempting to restart service");
+              tvCastingApp.discoverVideoPlayerCommissioners(successCallback, this);
+            }
           }
         };
 
     Button discoverButton = getView().findViewById(R.id.discoverButton);
     discoverButton.setOnClickListener(
-        new View.OnClickListener() {
-          @Override
-          public void onClick(View v) {
-            Log.d(TAG, "Discovering on button click");
-            tvCastingApp.discoverVideoPlayerCommissioners(
-                DISCOVERY_DURATION_SECS, successCallback, failureCallback);
-          }
+        v -> {
+          Log.d(TAG, "Discovering on button click");
+          tvCastingApp.discoverVideoPlayerCommissioners(successCallback, failureCallback);
         });
+  }
 
+  @Override
+  public void onResume() {
+    super.onResume();
     Log.d(TAG, "Auto discovering");
-    tvCastingApp.discoverVideoPlayerCommissioners(
-        DISCOVERY_DURATION_SECS, successCallback, failureCallback);
+
+    poller =
+        executor.scheduleAtFixedRate(
+            () -> {
+              tvCastingApp.discoverVideoPlayerCommissioners(successCallback, failureCallback);
+            },
+            0,
+            DISCOVERY_POLL_INTERVAL_MS,
+            TimeUnit.MILLISECONDS);
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    tvCastingApp.stopVideoPlayerDiscovery();
+    poller.cancel(true);
   }
 
-  @VisibleForTesting
-  public String getCommissionerButtonText(DiscoveredNodeData commissioner) {
+  /** Interface for notifying the host. */
+  public interface Callback {
+    /** Notifies listener of Commissioning Button click. */
+    void handleCommissioningButtonClicked(DiscoveredNodeData selectedCommissioner);
+  }
+}
+
+class VideoPlayerCommissionerAdapter extends ArrayAdapter<DiscoveredNodeData> {
+  private final List<DiscoveredNodeData> playerList;
+  private final Context context;
+  private LayoutInflater inflater;
+  private static final String TAG = VideoPlayerCommissionerAdapter.class.getSimpleName();
+
+  public VideoPlayerCommissionerAdapter(Context context, List<DiscoveredNodeData> playerList) {
+    super(context, 0, playerList);
+    this.context = context;
+    this.playerList = playerList;
+    inflater = (LayoutInflater.from(context));
+  }
+
+  @Override
+  public View getView(int i, View view, ViewGroup viewGroup) {
+    view = inflater.inflate(R.layout.commissionable_player_list_item, null);
+    String buttonText = getCommissionerButtonText(playerList.get(i));
+    Button playerDescription = view.findViewById(R.id.commissionable_player_description);
+    playerDescription.setText(buttonText);
+    View.OnClickListener clickListener =
+        v -> {
+          DiscoveredNodeData discoveredNodeData = playerList.get(i);
+          Log.d(TAG, "OnItemClickListener.onClick called for " + discoveredNodeData);
+          CommissionerDiscoveryFragment.Callback callback1 =
+              (CommissionerDiscoveryFragment.Callback) context;
+          callback1.handleCommissioningButtonClicked(discoveredNodeData);
+        };
+    playerDescription.setOnClickListener(clickListener);
+    return view;
+  }
+
+  private String getCommissionerButtonText(DiscoveredNodeData commissioner) {
     String main = commissioner.getDeviceName() != null ? commissioner.getDeviceName() : "";
     String aux =
         "" + (commissioner.getProductId() > 0 ? "Product ID: " + commissioner.getProductId() : "");
@@ -141,10 +205,4 @@ public String getCommissionerButtonText(DiscoveredNodeData commissioner) {
     String preCommissioned = commissioner.isPreCommissioned() ? " (Pre-commissioned)" : "";
     return main + aux + preCommissioned;
   }
-
-  /** Interface for notifying the host. */
-  public interface Callback {
-    /** Notifies listener of Commissioning Button click. */
-    void handleCommissioningButtonClicked(DiscoveredNodeData selectedCommissioner);
-  }
 }
diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java
index c48b28974ef22e..4f090b20e9ef20 100644
--- a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java
+++ b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java
@@ -25,7 +25,6 @@ public class ConnectionFragment extends Fragment {
   private final TvCastingApp tvCastingApp;
   private final DiscoveredNodeData selectedCommissioner;
 
-  private boolean verifyOrEstablishConnectionSuccess;
   private boolean openCommissioningWindowSuccess;
   private boolean sendUdcSuccess;
 
@@ -83,9 +82,8 @@ public void handle(ContentApp contentApp) {
     if (selectedCommissioner != null && selectedCommissioner.isPreCommissioned()) {
       VideoPlayer videoPlayer = selectedCommissioner.toConnectableVideoPlayer();
       Log.d(TAG, "Calling verifyOrEstablishConnectionSuccess with VideoPlayer: " + videoPlayer);
-      this.verifyOrEstablishConnectionSuccess =
-          tvCastingApp.verifyOrEstablishConnection(
-              videoPlayer, onConnectionSuccess, onConnectionFailure, onNewOrUpdatedEndpoints);
+      tvCastingApp.verifyOrEstablishConnection(
+          videoPlayer, onConnectionSuccess, onConnectionFailure, onNewOrUpdatedEndpoints);
     } else {
       Log.d(TAG, "Running commissioning");
       this.openCommissioningWindowSuccess =
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/DiscoveredNodeData.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/DiscoveredNodeData.java
index e3bc55388658ed..2590f82dc2bf92 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/DiscoveredNodeData.java
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/DiscoveredNodeData.java
@@ -18,13 +18,17 @@
 package com.chip.casting;
 
 import android.net.nsd.NsdServiceInfo;
+import android.util.Log;
 import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public class DiscoveredNodeData {
+  private static final String TAG = DiscoveredNodeData.class.getSimpleName();
+
   private static final int MAX_IP_ADDRESSES = 5;
   private static final int MAX_ROTATING_ID_LEN = 50;
   private static final String KEY_DEVICE_NAME = "DN";
@@ -51,26 +55,54 @@ public class DiscoveredNodeData {
 
   public DiscoveredNodeData(NsdServiceInfo serviceInfo) {
     Map<String, byte[]> attributes = serviceInfo.getAttributes();
-    this.deviceName = new String(attributes.get(KEY_DEVICE_NAME), StandardCharsets.UTF_8);
-    if (serviceInfo.getHost() != null) {
-      this.hostName = serviceInfo.getHost().getHostName();
-    }
-    this.deviceType =
-        Long.parseLong(new String(attributes.get(KEY_DEVICE_TYPE), StandardCharsets.UTF_8));
-
-    String vp = new String(attributes.get(KEY_VENDOR_PRODUCT), StandardCharsets.UTF_8);
-    if (vp != null) {
-      String[] vpArray = vp.split("\\+");
-      if (vpArray.length > 0) {
-        this.vendorId = Long.parseLong(vpArray[0]);
-        if (vpArray.length == 2) {
-          this.productId = Long.parseLong(vpArray[1]);
+
+    if (attributes != null) {
+      if (attributes.get(KEY_DEVICE_NAME) != null) {
+        this.deviceName = new String(attributes.get(KEY_DEVICE_NAME), StandardCharsets.UTF_8);
+      } else {
+        Log.e(TAG, "No device name (DN) found in DiscovoredNodeData");
+      }
+
+      if (attributes.get(KEY_DEVICE_TYPE) != null) {
+        try {
+          this.deviceType =
+              Long.parseLong(new String(attributes.get(KEY_DEVICE_TYPE), StandardCharsets.UTF_8));
+        } catch (NumberFormatException e) {
+          Log.e(TAG, "Could not parse TXT record for DT: " + e.getMessage());
         }
+      } else {
+        Log.e(TAG, "TXT Record for DT was null");
       }
+
+      if (attributes.get(KEY_VENDOR_PRODUCT) != null) {
+        String vp = new String(attributes.get(KEY_VENDOR_PRODUCT), StandardCharsets.UTF_8);
+        if (vp != null) {
+          String[] vpArray = vp.split("\\+");
+          try {
+            if (vpArray.length > 0) {
+              this.vendorId = Long.parseLong(vpArray[0]);
+              if (vpArray.length == 2) {
+                this.productId = Long.parseLong(vpArray[1]);
+              }
+            }
+          } catch (NumberFormatException e) {
+            Log.e(TAG, "Could not parse TXT record for VP: " + e.getMessage());
+          }
+        }
+      } else {
+        Log.e(TAG, "TXT Record for VP was null");
+      }
+    } else {
+      Log.e(TAG, "NsdServiceInfo.attributes was null");
     }
 
+    if (serviceInfo.getHost() != null) {
+      this.hostName = serviceInfo.getHost().getHostName();
+      this.ipAddresses = Arrays.asList(serviceInfo.getHost());
+    } else {
+      Log.e(TAG, "Host name was null");
+    }
     this.port = serviceInfo.getPort();
-    this.ipAddresses = Arrays.asList(serviceInfo.getHost());
     this.numIPs = 1;
   }
 
@@ -185,4 +217,22 @@ public String toString() {
         + ipAddresses
         + '}';
   }
+
+  /**
+   * Checks to see if a discovered node is "effectively equal" to another by comparing the
+   * parameters that should not change.
+   *
+   * @param o the object to compare to.
+   * @return true if the objects are from the same source, false otherwise.
+   */
+  public boolean discoveredNodeHasSameSource(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    DiscoveredNodeData that = (DiscoveredNodeData) o;
+    return vendorId == that.vendorId
+        && productId == that.productId
+        && commissioningMode == that.commissioningMode
+        && deviceType == that.deviceType
+        && Objects.equals(hostName, that.hostName);
+  }
 }
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/MatterError.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/MatterError.java
index aaaf95911f18da..e669a7b61bc56b 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/MatterError.java
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/MatterError.java
@@ -23,6 +23,9 @@ public class MatterError {
   private int errorCode;
   private String errorMessage;
 
+  public static final MatterError DISCOVERY_SERVICE_LOST =
+      new MatterError(4, "Discovery service was lost.");
+
   public static final MatterError NO_ERROR = new MatterError(0, null);
 
   public MatterError(int errorCode, String errorMessage) {
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java
index 5fda64cbbba8ef..905dcb67f86bc8 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java
@@ -95,6 +95,7 @@ public void onServiceLost(NsdServiceInfo service) {
     // When the network service is no longer available.
     // Internal bookkeeping code goes here.
     Log.e(TAG, "Service lost: " + service);
+    failureCallback.handle(MatterError.DISCOVERY_SERVICE_LOST);
   }
 
   @Override
@@ -111,7 +112,6 @@ public void onStartDiscoveryFailed(String serviceType, int errorCode) {
     failureCallback.handle(
         new MatterError(
             3, "NsdDiscoveryListener Discovery failed to start: Nsd Error code:" + errorCode));
-    nsdManager.stopServiceDiscovery(this);
   }
 
   @Override
@@ -123,6 +123,5 @@ public void onStopDiscoveryFailed(String serviceType, int errorCode) {
     failureCallback.handle(
         new MatterError(
             3, "NsdDiscoveryListener Discovery failed to stop: Nsd Error code:" + errorCode));
-    nsdManager.stopServiceDiscovery(this);
   }
 }
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java
index 43e7860e6b0527..316edf3ba26357 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java
@@ -32,8 +32,6 @@
 import chip.platform.PreferencesKeyValueStoreManager;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 public class TvCastingApp {
   private static final String TAG = TvCastingApp.class.getSimpleName();
@@ -44,6 +42,11 @@ public class TvCastingApp {
   private Context applicationContext;
   private ChipAppServer chipAppServer;
   private NsdManagerServiceResolver.NsdManagerResolverAvailState nsdManagerResolverAvailState;
+  private boolean discoveryStarted = false;
+
+  private WifiManager.MulticastLock multicastLock;
+  private NsdManager nsdManager;
+  private NsdDiscoveryListener nsdDiscoveryListener;
 
   public boolean initApp(Context applicationContext, AppParameters appParameters) {
     if (applicationContext == null || appParameters == null) {
@@ -103,21 +106,25 @@ public boolean initApp(Context applicationContext, AppParameters appParameters)
   private native boolean initJni(AppParameters appParameters);
 
   public void discoverVideoPlayerCommissioners(
-      long discoveryDurationSeconds,
       SuccessCallback<DiscoveredNodeData> discoverySuccessCallback,
       FailureCallback discoveryFailureCallback) {
     Log.d(TAG, "TvCastingApp.discoverVideoPlayerCommissioners called");
 
+    if (this.discoveryStarted) {
+      Log.d(TAG, "Discovery already started, stopping before starting again");
+      stopVideoPlayerDiscovery();
+    }
+
     List<VideoPlayer> preCommissionedVideoPlayers = readCachedVideoPlayers();
 
     WifiManager wifiManager =
         (WifiManager) applicationContext.getSystemService(Context.WIFI_SERVICE);
-    WifiManager.MulticastLock multicastLock = wifiManager.createMulticastLock("multicastLock");
+    multicastLock = wifiManager.createMulticastLock("multicastLock");
     multicastLock.setReferenceCounted(true);
     multicastLock.acquire();
 
-    NsdManager nsdManager = (NsdManager) applicationContext.getSystemService(Context.NSD_SERVICE);
-    NsdDiscoveryListener nsdDiscoveryListener =
+    nsdManager = (NsdManager) applicationContext.getSystemService(Context.NSD_SERVICE);
+    nsdDiscoveryListener =
         new NsdDiscoveryListener(
             nsdManager,
             DISCOVERY_TARGET_SERVICE_TYPE,
@@ -129,20 +136,23 @@ public void discoverVideoPlayerCommissioners(
 
     nsdManager.discoverServices(
         DISCOVERY_TARGET_SERVICE_TYPE, NsdManager.PROTOCOL_DNS_SD, nsdDiscoveryListener);
+    Log.d(TAG, "TvCastingApp.discoverVideoPlayerCommissioners started");
+    this.discoveryStarted = true;
+  }
 
-    Executors.newSingleThreadScheduledExecutor()
-        .schedule(
-            new Runnable() {
-              @Override
-              public void run() {
-                Log.d(TAG, "TvCastingApp stopping Video Player commissioner discovery");
-                nsdManager.stopServiceDiscovery(nsdDiscoveryListener);
-                multicastLock.release();
-              }
-            },
-            discoveryDurationSeconds,
-            TimeUnit.SECONDS);
-    Log.d(TAG, "TvCastingApp.discoverVideoPlayerCommissioners ended");
+  public void stopVideoPlayerDiscovery() {
+    Log.d(TAG, "TvCastingApp trying to stop video player discovery");
+    if (this.discoveryStarted
+        && nsdManager != null
+        && multicastLock != null
+        && nsdDiscoveryListener != null) {
+      Log.d(TAG, "TvCastingApp stopping Video Player commissioner discovery");
+      nsdManager.stopServiceDiscovery(nsdDiscoveryListener);
+      if (multicastLock.isHeld()) {
+        multicastLock.release();
+      }
+      this.discoveryStarted = false;
+    }
   }
 
   public native boolean openBasicCommissioningWindow(
diff --git a/examples/tv-casting-app/android/App/app/src/main/res/layout/commissionable_player_list_item.xml b/examples/tv-casting-app/android/App/app/src/main/res/layout/commissionable_player_list_item.xml
new file mode 100644
index 00000000000000..a3adc515f19184
--- /dev/null
+++ b/examples/tv-casting-app/android/App/app/src/main/res/layout/commissionable_player_list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/commissionable_player_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml b/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml
index c65a647957b28e..7cfdf23b0b335b 100644
--- a/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml
+++ b/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml
@@ -7,8 +7,8 @@
 
     <LinearLayout
         android:id="@+id/castingCommissioners"
-        android:layout_width="409dp"
-        android:layout_height="729dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         tools:layout_editor_absoluteX="1dp"
         tools:layout_editor_absoluteY="1dp"
@@ -31,6 +31,12 @@
             android:layout_height="wrap_content"
             android:text="@string/discovery_message_text"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <ListView
+            android:id = "@+id/commissionerList"
+            android:layout_width = "match_parent"
+            android:layout_height = "wrap_content"
+            android:fadeScrollbars = "false" />
     </LinearLayout>
 
 
diff --git a/examples/tv-casting-app/darwin/TvCasting/TvCasting/CommissionerDiscoveryViewModel.swift b/examples/tv-casting-app/darwin/TvCasting/TvCasting/CommissionerDiscoveryViewModel.swift
index 4438759922949f..3bc7492de10dac 100644
--- a/examples/tv-casting-app/darwin/TvCasting/TvCasting/CommissionerDiscoveryViewModel.swift
+++ b/examples/tv-casting-app/darwin/TvCasting/TvCasting/CommissionerDiscoveryViewModel.swift
@@ -37,7 +37,9 @@ class CommissionerDiscoveryViewModel: ObservableObject {
                     self.Log.info("discoveredCommissionerHandler called with \(commissioner)")
                     if(self.commissioners.contains(commissioner))
                     {
-                        self.Log.info("Skipping previously discovered commissioner \(commissioner.description)")
+                        var index = self.commissioners.firstIndex(of: commissioner)
+                        self.commissioners[index!] = commissioner
+                        self.Log.info("Updating previously discovered commissioner \(commissioner.description)")
                     }
                     else if(commissioner.numIPs == 0)
                     {
@@ -69,7 +71,9 @@ class CommissionerDiscoveryViewModel: ObservableObject {
                     if(commissioner != nil){
                         if(self.commissioners.contains(commissioner!))
                         {
-                            self.Log.info("Skipping previously discovered commissioner \(commissioner!.description)")
+                            var index = self.commissioners.firstIndex(of: commissioner!)
+                            self.commissioners[index!] = commissioner!
+                            self.Log.info("Updating previously discovered commissioner \(commissioner!.description)")
                         }
                         else
                         {
diff --git a/examples/window-app/silabs/SiWx917/src/WindowAppImpl.cpp b/examples/window-app/silabs/SiWx917/src/WindowAppImpl.cpp
old mode 100755
new mode 100644
index 5de43dce66fb3f..4cb033e349a366
--- a/examples/window-app/silabs/SiWx917/src/WindowAppImpl.cpp
+++ b/examples/window-app/silabs/SiWx917/src/WindowAppImpl.cpp
@@ -69,11 +69,11 @@ chip::app::Clusters::NetworkCommissioning::Instance
 WindowAppImpl::Timer::Timer(const char * name, uint32_t timeoutInMs, Callback callback, void * context) :
     WindowApp::Timer(name, timeoutInMs, callback, context)
 {
-    mHandler = xTimerCreate(name,          // Just a text name, not used by the RTOS kernel
-                            timeoutInMs,   // == default timer period (mS)
-                            false,         // no timer reload (==one-shot)
-                            (void *) this, // init timer id = app task obj context
-                            TimerCallback  // timer callback handler
+    mHandler = xTimerCreate(name,                       // Just a text name, not used by the RTOS kernel
+                            pdMS_TO_TICKS(timeoutInMs), // == default timer period
+                            false,                      // no timer reload (==one-shot)
+                            (void *) this,              // init timer id = app task obj context
+                            TimerCallback               // timer callback handler
     );
     if (mHandler == NULL)
     {
@@ -90,7 +90,7 @@ void WindowAppImpl::Timer::Start()
     }
 
     // Timer is not active
-    if (xTimerStart(mHandler, 100) != pdPASS)
+    if (xTimerStart(mHandler, pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("Timer start() failed");
         appError(CHIP_ERROR_INTERNAL);
@@ -115,7 +115,7 @@ void WindowAppImpl::Timer::IsrStart()
 void WindowAppImpl::Timer::Stop()
 {
     mIsActive = false;
-    if (xTimerStop(mHandler, 0) == pdFAIL)
+    if (xTimerStop(mHandler, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         SILABS_LOG("Timer stop() failed");
         appError(CHIP_ERROR_INTERNAL);
diff --git a/examples/window-app/silabs/efr32/src/WindowAppImpl.cpp b/examples/window-app/silabs/efr32/src/WindowAppImpl.cpp
index dd81caba36278c..29847a8031fc93 100644
--- a/examples/window-app/silabs/efr32/src/WindowAppImpl.cpp
+++ b/examples/window-app/silabs/efr32/src/WindowAppImpl.cpp
@@ -74,11 +74,11 @@ chip::app::Clusters::NetworkCommissioning::Instance
 WindowAppImpl::Timer::Timer(const char * name, uint32_t timeoutInMs, Callback callback, void * context) :
     WindowApp::Timer(name, timeoutInMs, callback, context)
 {
-    mHandler = xTimerCreate(name,          // Just a text name, not used by the RTOS kernel
-                            timeoutInMs,   // == default timer period (mS)
-                            false,         // no timer reload (==one-shot)
-                            (void *) this, // init timer id = app task obj context
-                            TimerCallback  // timer callback handler
+    mHandler = xTimerCreate(name,                       // Just a text name, not used by the RTOS kernel
+                            pdMS_TO_TICKS(timeoutInMs), // == default timer period (mS)
+                            false,                      // no timer reload (==one-shot)
+                            (void *) this,              // init timer id = app task obj context
+                            TimerCallback               // timer callback handler
     );
     if (mHandler == NULL)
     {
@@ -95,7 +95,7 @@ void WindowAppImpl::Timer::Start()
     }
 
     // Timer is not active
-    if (xTimerStart(mHandler, 100) != pdPASS)
+    if (xTimerStart(mHandler, pdMS_TO_TICKS(100)) != pdPASS)
     {
         SILABS_LOG("Timer start() failed");
         appError(CHIP_ERROR_INTERNAL);
@@ -120,7 +120,7 @@ void WindowAppImpl::Timer::IsrStart()
 void WindowAppImpl::Timer::Stop()
 {
     mIsActive = false;
-    if (xTimerStop(mHandler, 0) == pdFAIL)
+    if (xTimerStop(mHandler, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         SILABS_LOG("Timer stop() failed");
         appError(CHIP_ERROR_INTERNAL);
diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
index fb4d3eb885152a..09a7f34edda33f 100644
--- a/integrations/cloudbuild/build-all.yaml
+++ b/integrations/cloudbuild/build-all.yaml
@@ -6,7 +6,7 @@ steps:
           - "--init"
           - "--recursive"
       id: Submodules
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -21,7 +21,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -76,7 +76,7 @@ steps:
               --target k32w-shell
               build
               --create-archives /workspace/artifacts/
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
index 3209c6ef4f42fe..a2b209ebf1fc94 100644
--- a/integrations/cloudbuild/chef.yaml
+++ b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 2700s
 
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -26,7 +26,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index 26ce04825e6dfd..25232f3d742ab1 100644
--- a/integrations/cloudbuild/smoke-test.yaml
+++ b/integrations/cloudbuild/smoke-test.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       entrypoint: "bash"
       args:
           - "-c"
@@ -7,7 +7,7 @@ steps:
               git config --global --add safe.directory "*"
               git submodule update --init --recursive
       id: Submodules
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -22,7 +22,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -41,7 +41,7 @@ steps:
       volumes:
           - name: pwenv
             path: /pwenv
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -62,7 +62,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -84,7 +84,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -144,7 +144,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.6.47"
+    - name: "connectedhomeip/chip-build-vscode:0.6.48"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
diff --git a/scripts/build/builders/esp32.py b/scripts/build/builders/esp32.py
index f9b50927dd41ab..9c7f62915686d2 100644
--- a/scripts/build/builders/esp32.py
+++ b/scripts/build/builders/esp32.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2021-2023 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.
@@ -126,6 +126,7 @@ def DefaultsFileName(board: Esp32Board, app: Esp32App, enable_rpcs: bool):
         specific_apps = {
             Esp32App.ALL_CLUSTERS,
             Esp32App.ALL_CLUSTERS_MINIMAL,
+            Esp32App.LIGHT,
             Esp32App.OTA_REQUESTOR,
         }
         if app in specific_apps:
diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser_builder.py b/scripts/py_matter_yamltests/matter_yamltests/parser_builder.py
index ae4458ae6990af..72ebae6a1fff8f 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/parser_builder.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/parser_builder.py
@@ -51,9 +51,10 @@ class TestParserBuilderConfig:
            current parsing state.
     """
     tests: list[str] = field(default_factory=list)
-    parser_config: TestParserConfig = TestParserConfig()
+    parser_config: TestParserConfig = field(default_factory=TestParserConfig)
     hooks: TestParserHooks = TestParserHooks()
-    options: TestParserBuilderOptions = TestParserBuilderOptions()
+    options: TestParserBuilderOptions = field(
+        default_factory=TestParserBuilderOptions)
 
 
 class TestParserBuilder:
diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
index 1e6c3ed198ea3a..3fe465637e225c 100644
--- a/src/app/InteractionModelEngine.cpp
+++ b/src/app/InteractionModelEngine.cpp
@@ -74,6 +74,8 @@ CHIP_ERROR InteractionModelEngine::Init(Messaging::ExchangeManager * apExchangeM
 
 void InteractionModelEngine::Shutdown()
 {
+    mpExchangeMgr->GetSessionManager()->SystemLayer()->CancelTimer(ResumeSubscriptionsTimerCallback, this);
+
     CommandHandlerInterface * handlerIter = mCommandHandlerList;
 
     //
@@ -1591,33 +1593,89 @@ CHIP_ERROR InteractionModelEngine::ResumeSubscriptions()
 #if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
     ReturnErrorCodeIf(!mpSubscriptionResumptionStorage, CHIP_NO_ERROR);
 
+    // To avoid the case of a reboot loop causing rapid traffic generation / power consumption, subscription resumption should make
+    // use of the persisted min-interval values, and wait before resumption. Ideally, each persisted subscription should wait their
+    // own min-interval value before resumption, but that both A) potentially runs into a timer resource issue, and B) having a
+    // low-powered device wake many times also has energy use implications. The logic below waits the largest of the persisted
+    // min-interval values before resuming subscriptions.
+
+    // Even though this causes subscription-to-subscription interaction by linking the min-interval values, this is the right thing
+    // to do for now because it's both simple and avoids the timer resource and multiple-wake problems. This issue is to track
+    // future improvements: https://github.com/project-chip/connectedhomeip/issues/25439
+
+    SubscriptionResumptionStorage::SubscriptionInfo subscriptionInfo;
+    auto * iterator           = mpSubscriptionResumptionStorage->IterateSubscriptions();
+    int subscriptionsToResume = 0;
+    uint16_t minInterval      = 0;
+    while (iterator->Next(subscriptionInfo))
+    {
+        subscriptionsToResume++;
+        minInterval = std::max(minInterval, subscriptionInfo.mMinInterval);
+    }
+    iterator->Release();
+
+    if (subscriptionsToResume)
+    {
+        ChipLogProgress(InteractionModel, "Resuming %d subscriptions in %u seconds", subscriptionsToResume, minInterval);
+        ReturnErrorOnFailure(mpExchangeMgr->GetSessionManager()->SystemLayer()->StartTimer(System::Clock::Seconds16(minInterval),
+                                                                                           ResumeSubscriptionsTimerCallback, this));
+    }
+    else
+    {
+        ChipLogProgress(InteractionModel, "No subscriptions to resume");
+    }
+#endif // CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
+
+    return CHIP_NO_ERROR;
+}
+
+void InteractionModelEngine::ResumeSubscriptionsTimerCallback(System::Layer * apSystemLayer, void * apAppState)
+{
+#if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
+    VerifyOrReturn(apAppState != nullptr);
+    InteractionModelEngine * imEngine = static_cast<InteractionModelEngine *>(apAppState);
     SubscriptionResumptionStorage::SubscriptionInfo subscriptionInfo;
-    auto * iterator = mpSubscriptionResumptionStorage->IterateSubscriptions();
+    auto * iterator = imEngine->mpSubscriptionResumptionStorage->IterateSubscriptions();
     while (iterator->Next(subscriptionInfo))
     {
+        // If subscription happens between reboot and this timer callback, it's already live and should skip resumption
+        if (Loop::Break == imEngine->mReadHandlers.ForEachActiveObject([&](ReadHandler * handler) {
+                SubscriptionId subscriptionId;
+                handler->GetSubscriptionId(subscriptionId);
+                if (subscriptionId == subscriptionInfo.mSubscriptionId)
+                {
+                    return Loop::Break;
+                }
+                return Loop::Continue;
+            }))
+        {
+            ChipLogProgress(InteractionModel, "Skip resuming live subscriptionId %" PRIu32, subscriptionInfo.mSubscriptionId);
+            continue;
+        }
+
         auto requestedAttributePathCount = subscriptionInfo.mAttributePaths.AllocatedSize();
         auto requestedEventPathCount     = subscriptionInfo.mEventPaths.AllocatedSize();
-        if (!EnsureResourceForSubscription(subscriptionInfo.mFabricIndex, requestedAttributePathCount, requestedEventPathCount))
+        if (!imEngine->EnsureResourceForSubscription(subscriptionInfo.mFabricIndex, requestedAttributePathCount,
+                                                     requestedEventPathCount))
         {
             ChipLogProgress(InteractionModel, "no resource for Subscription resumption");
             iterator->Release();
-            return CHIP_ERROR_NO_MEMORY;
+            return;
         }
 
-        ReadHandler * handler = mReadHandlers.CreateObject(*this);
+        ReadHandler * handler = imEngine->mReadHandlers.CreateObject(*imEngine);
         if (handler == nullptr)
         {
             ChipLogProgress(InteractionModel, "no resource for ReadHandler creation");
             iterator->Release();
-            return CHIP_ERROR_NO_MEMORY;
+            return;
         }
 
-        handler->ResumeSubscription(*mpCASESessionMgr, subscriptionInfo);
+        ChipLogProgress(InteractionModel, "Resuming subscriptionId %" PRIu32, subscriptionInfo.mSubscriptionId);
+        handler->ResumeSubscription(*imEngine->mpCASESessionMgr, subscriptionInfo);
     }
     iterator->Release();
 #endif // CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
-
-    return CHIP_NO_ERROR;
 }
 
 } // namespace app
diff --git a/src/app/InteractionModelEngine.h b/src/app/InteractionModelEngine.h
index c1bb9bd3b85260..5401511899e0d5 100644
--- a/src/app/InteractionModelEngine.h
+++ b/src/app/InteractionModelEngine.h
@@ -536,6 +536,8 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
     void ShutdownMatchingSubscriptions(const Optional<FabricIndex> & aFabricIndex = NullOptional,
                                        const Optional<NodeId> & aPeerNodeId       = NullOptional);
 
+    static void ResumeSubscriptionsTimerCallback(System::Layer * apSystemLayer, void * apAppState);
+
     template <typename T, size_t N>
     void ReleasePool(ObjectList<T> *& aObjectList, ObjectPool<ObjectList<T>, N> & aObjectPool);
     template <typename T, size_t N>
diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp
index cbd131f288c3b0..939c599704724d 100644
--- a/src/app/ReadClient.cpp
+++ b/src/app/ReadClient.cpp
@@ -31,6 +31,7 @@
 #include <lib/core/TLVTypes.h>
 #include <lib/support/FibonacciUtils.h>
 #include <messaging/ReliableMessageMgr.h>
+#include <messaging/ReliableMessageProtocolConfig.h>
 
 namespace chip {
 namespace app {
@@ -808,11 +809,17 @@ CHIP_ERROR ReadClient::RefreshLivenessCheckTimer()
         // computing the Ack timeout from the publisher for the ReportData message being sent to us using our IDLE interval as the
         // basis for that computation.
         //
+        // Make sure to use the retransmission computation that includes backoff.  For purposes of that computation, treat us as
+        // active now (since we are right now sending/receiving messages), and use the default "how long are we guaranteed to stay
+        // active" threshold for now.
+        //
         // TODO: We need to find a good home for this logic that will correctly compute this based on transport. For now, this will
         // suffice since we don't use TCP as a transport currently and subscriptions over BLE aren't really a thing.
         //
+        const auto & ourMrpConfig = GetDefaultMRPConfig();
         auto publisherTransmissionTimeout =
-            GetLocalMRPConfig().ValueOr(GetDefaultMRPConfig()).mIdleRetransTimeout * (CHIP_CONFIG_RMP_DEFAULT_MAX_RETRANS + 1);
+            GetRetransmissionTimeout(ourMrpConfig.mActiveRetransTimeout, ourMrpConfig.mIdleRetransTimeout,
+                                     System::SystemClock().GetMonotonicTimestamp(), Transport::kMinActiveTime);
         timeout = System::Clock::Seconds16(mMaxInterval) + publisherTransmissionTimeout;
     }
 
diff --git a/src/app/clusters/bindings/BindingManager.cpp b/src/app/clusters/bindings/BindingManager.cpp
index 35ebecda2b3be4..a84466cd17b90d 100644
--- a/src/app/clusters/bindings/BindingManager.cpp
+++ b/src/app/clusters/bindings/BindingManager.cpp
@@ -108,6 +108,8 @@ CHIP_ERROR BindingManager::EstablishConnection(const ScopedNodeId & nodeId)
 
     mLastSessionEstablishmentError = CHIP_NO_ERROR;
     auto * connectionCallback      = Platform::New<ConnectionCallback>(*this);
+    VerifyOrReturnError(connectionCallback != nullptr, CHIP_ERROR_NO_MEMORY);
+
     mInitParams.mCASESessionManager->FindOrEstablishSession(nodeId, connectionCallback->GetOnDeviceConnected(),
                                                             connectionCallback->GetOnDeviceConnectionFailure());
     if (mLastSessionEstablishmentError == CHIP_ERROR_NO_MEMORY)
diff --git a/src/app/clusters/bindings/bindings.cpp b/src/app/clusters/bindings/bindings.cpp
index 0b48cee6f6c4a4..22c4fba0be6920 100644
--- a/src/app/clusters/bindings/bindings.cpp
+++ b/src/app/clusters/bindings/bindings.cpp
@@ -30,6 +30,8 @@
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <lib/support/logging/CHIPLogging.h>
+#include <protocols/interaction_model/StatusCode.h>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
@@ -117,7 +119,7 @@ CHIP_ERROR CheckValidBindingList(const EndpointId localEndpoint, const Decodable
     return CHIP_NO_ERROR;
 }
 
-void CreateBindingEntry(const TargetStructType & entry, EndpointId localEndpoint)
+CHIP_ERROR CreateBindingEntry(const TargetStructType & entry, EndpointId localEndpoint)
 {
     EmberBindingTableEntry bindingEntry;
 
@@ -131,7 +133,7 @@ void CreateBindingEntry(const TargetStructType & entry, EndpointId localEndpoint
                                                        entry.cluster);
     }
 
-    AddBindingEntry(bindingEntry);
+    return AddBindingEntry(bindingEntry);
 }
 
 CHIP_ERROR BindingTableAccess::Read(const ConcreteReadAttributePath & path, AttributeValueEncoder & encoder)
@@ -225,10 +227,11 @@ CHIP_ERROR BindingTableAccess::WriteBindingTable(const ConcreteDataAttributePath
         }
 
         // Add new entries
-        auto iter = newBindingList.begin();
-        while (iter.Next())
+        auto iter      = newBindingList.begin();
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        while (iter.Next() && err == CHIP_NO_ERROR)
         {
-            CreateBindingEntry(iter.GetValue(), path.mEndpointId);
+            err = CreateBindingEntry(iter.GetValue(), path.mEndpointId);
         }
 
         // If this was not caused by a list operation, OnListWriteEnd is not going to be triggered
@@ -238,7 +241,7 @@ CHIP_ERROR BindingTableAccess::WriteBindingTable(const ConcreteDataAttributePath
             // Notify binding table has changed
             LogErrorOnFailure(NotifyBindingsChanged());
         }
-        return CHIP_NO_ERROR;
+        return err;
     }
     if (path.mListOp == ConcreteDataAttributePath::ListOperation::AppendItem)
     {
@@ -248,8 +251,7 @@ CHIP_ERROR BindingTableAccess::WriteBindingTable(const ConcreteDataAttributePath
         {
             return CHIP_IM_GLOBAL_STATUS(ConstraintError);
         }
-        CreateBindingEntry(target, path.mEndpointId);
-        return CHIP_NO_ERROR;
+        return CreateBindingEntry(target, path.mEndpointId);
     }
     return CHIP_IM_GLOBAL_STATUS(UnsupportedWrite);
 }
@@ -269,11 +271,22 @@ void MatterBindingPluginServerInitCallback()
     registerAttributeAccessOverride(&gAttrAccess);
 }
 
-void AddBindingEntry(const EmberBindingTableEntry & entry)
+CHIP_ERROR AddBindingEntry(const EmberBindingTableEntry & entry)
 {
+    CHIP_ERROR err = BindingTable::GetInstance().Add(entry);
+    if (err == CHIP_ERROR_NO_MEMORY)
+    {
+        return CHIP_IM_GLOBAL_STATUS(ResourceExhausted);
+    }
+
+    if (err != CHIP_NO_ERROR)
+    {
+        return err;
+    }
+
     if (entry.type == EMBER_UNICAST_BINDING)
     {
-        CHIP_ERROR err = BindingManager::GetInstance().UnicastBindingCreated(entry.fabricIndex, entry.nodeId);
+        err = BindingManager::GetInstance().UnicastBindingCreated(entry.fabricIndex, entry.nodeId);
         if (err != CHIP_NO_ERROR)
         {
             // Unicast connection failure can happen if peer is offline. We'll retry connection on-demand.
@@ -283,5 +296,5 @@ void AddBindingEntry(const EmberBindingTableEntry & entry)
         }
     }
 
-    BindingTable::GetInstance().Add(entry);
+    return CHIP_NO_ERROR;
 }
diff --git a/src/app/clusters/bindings/bindings.h b/src/app/clusters/bindings/bindings.h
index 3d6d773cdbcd8c..b77f7e99b2cedf 100644
--- a/src/app/clusters/bindings/bindings.h
+++ b/src/app/clusters/bindings/bindings.h
@@ -28,4 +28,4 @@
  *
  * @param entry binding to add
  */
-void AddBindingEntry(const EmberBindingTableEntry & entry);
+CHIP_ERROR AddBindingEntry(const EmberBindingTableEntry & entry);
diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
index 2d80cda46605a5..72c26f0457b076 100644
--- a/src/app/clusters/color-control-server/color-control-server.cpp
+++ b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -106,6 +106,19 @@ bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, c
     if (shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
         status = stopAllColorTransitions(endpoint);
+
+#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
+        // Because Hue and Saturation have separate transitions and can be kicked separately,
+        // a new command specific to Hue could resume an old unfinished Saturation transition. Or vice versa.
+        // Init both transition states on stop command to prevent that.
+        if (status == Status::Success)
+        {
+            ColorHueTransitionState * hueState        = getColorHueTransitionState(endpoint);
+            Color16uTransitionState * saturationState = getSaturationTransitionState(endpoint);
+            initHueTransitionState(endpoint, hueState, false /*isEnhancedHue don't care*/);
+            initSaturationTransitionState(endpoint, saturationState);
+        }
+#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
     }
 
     commandObj->AddStatus(commandPath, status);
@@ -328,23 +341,22 @@ void ColorControlServer::computePwmFromXy(EndpointId endpoint) {}
 /**
  * @brief Computes new color value based on current position
  *
- * @param p ColorHueTransitionState*
- * @return true command mouvement is finished
- * @return false command mouvement is not finished
+ * @param p Color16uTransitionState*
+ * @return true command movement is finished
+ * @return false command movement is not finished
  */
 bool ColorControlServer::computeNewColor16uValue(ColorControlServer::Color16uTransitionState * p)
 {
     uint32_t newValue32u;
 
+    // Color value isn't moving
     if (p->stepsRemaining == 0)
     {
-        return false;
+        return true;
     }
 
     (p->stepsRemaining)--;
 
-    Attributes::RemainingTime::Set(p->endpoint, p->stepsRemaining);
-
     // handle sign
     if (p->finalValue == p->currentValue)
     {
@@ -552,8 +564,8 @@ uint16_t ColorControlServer::subtractEnhancedHue(uint16_t hue1, uint16_t hue2)
  */
 void ColorControlServer::startColorLoop(EndpointId endpoint, uint8_t startFromStartHue)
 {
-    ColorHueTransitionState * colorHueTransitionState        = getColorHueTransitionState(endpoint);
-    Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
+    ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
+    VerifyOrReturn(colorHueTransitionState != nullptr);
 
     uint8_t direction = 0;
     Attributes::ColorLoopDirection::Get(endpoint, &direction);
@@ -561,28 +573,22 @@ void ColorControlServer::startColorLoop(EndpointId endpoint, uint8_t startFromSt
     uint16_t time = 0x0019;
     Attributes::ColorLoopTime::Get(endpoint, &time);
 
-    uint16_t currentHue = 0;
-    Attributes::EnhancedCurrentHue::Get(endpoint, &currentHue);
+    uint16_t startHue = 0x2300;
+
+    initHueTransitionState(endpoint, colorHueTransitionState, true /*isEnhancedHue Always true for colorLoop*/);
+    Attributes::ColorLoopStoredEnhancedHue::Set(endpoint, colorHueTransitionState->currentEnhancedHue);
+    Attributes::ColorLoopActive::Set(endpoint, true);
 
-    u_int16_t startHue = 0x2300;
     if (startFromStartHue)
     {
         Attributes::ColorLoopStartEnhancedHue::Get(endpoint, &startHue);
     }
     else
     {
-        startHue = currentHue;
+        startHue = colorHueTransitionState->currentEnhancedHue;
     }
 
-    Attributes::ColorLoopStoredEnhancedHue::Set(endpoint, currentHue);
-    Attributes::ColorLoopActive::Set(endpoint, true);
-
-    initHueSat(endpoint, colorHueTransitionState, colorSaturationTransitionState);
-
-    colorHueTransitionState->isEnhancedHue = true;
-
     colorHueTransitionState->initialEnhancedHue = startHue;
-    colorHueTransitionState->currentEnhancedHue = currentHue;
 
     if (direction)
     {
@@ -606,52 +612,73 @@ void ColorControlServer::startColorLoop(EndpointId endpoint, uint8_t startFromSt
 }
 
 /**
- * @brief Initialise memory structures for new command
+ * @brief Initialise Hue and EnhancedHue TransitionState structure to begin a new transition
  *
- * @param[in] endpoint
- * @param[out] colorHueTransitionState
- * @param[out] colorSatTransitionState
  */
-void ColorControlServer::initHueSat(EndpointId endpoint, ColorControlServer::ColorHueTransitionState * colorHueTransitionState,
-                                    ColorControlServer::Color16uTransitionState * colorSatTransitionState)
+void ColorControlServer::initHueTransitionState(EndpointId endpoint, ColorHueTransitionState * colorHueTransitionState,
+                                                bool isEnhancedHue)
 {
     colorHueTransitionState->stepsRemaining = 0;
-    Attributes::CurrentHue::Get(endpoint, &(colorHueTransitionState->currentHue));
-    colorHueTransitionState->endpoint = endpoint;
+    colorHueTransitionState->isEnhancedHue  = isEnhancedHue;
+    colorHueTransitionState->endpoint       = endpoint;
 
-    Attributes::EnhancedCurrentHue::Get(endpoint, &(colorHueTransitionState->currentEnhancedHue));
-    colorHueTransitionState->isEnhancedHue = false;
+    if (isEnhancedHue)
+    {
+        Attributes::EnhancedCurrentHue::Get(endpoint, &(colorHueTransitionState->currentEnhancedHue));
+        colorHueTransitionState->initialEnhancedHue = colorHueTransitionState->currentEnhancedHue;
+    }
+    else
+    {
+        Attributes::CurrentHue::Get(endpoint, &(colorHueTransitionState->currentHue));
+        colorHueTransitionState->initialHue = colorHueTransitionState->currentHue;
+    }
+}
 
+/**
+ * @brief Initialise Saturation Transition State structure to begin a new transition
+ *
+ */
+void ColorControlServer::initSaturationTransitionState(chip::EndpointId endpoint, Color16uTransitionState * colorSatTransitionState)
+{
     colorSatTransitionState->stepsRemaining = 0;
-    colorSatTransitionState->currentValue   = getSaturation(endpoint);
     colorSatTransitionState->endpoint       = endpoint;
+
+    colorSatTransitionState->initialValue = colorSatTransitionState->currentValue = getSaturation(endpoint);
+}
+
+void ColorControlServer::SetHSVRemainingTime(chip::EndpointId endpoint)
+{
+    ColorHueTransitionState * hueTransitionState        = getColorHueTransitionState(endpoint);
+    Color16uTransitionState * saturationTransitionState = getSaturationTransitionState(endpoint);
+
+    // When the hue transition is loop, RemainingTime stays at MAX_INT16
+    if (hueTransitionState->repeat == false)
+    {
+        Attributes::RemainingTime::Set(endpoint,
+                                       max(hueTransitionState->stepsRemaining, saturationTransitionState->stepsRemaining));
+    }
 }
 
 /**
  * @brief Computes new hue value based on current position
  *
  * @param p ColorHueTransitionState*
- * @return true command mouvement is finished
- * @return false command mouvement is not finished
+ * @return true command movement is finished
+ * @return false command movement is not finished
  */
 bool ColorControlServer::computeNewHueValue(ColorControlServer::ColorHueTransitionState * p)
 {
     uint32_t newHue32;
     uint16_t newHue;
 
-    // exit with a false if hue is not currently moving
+    // hue is not currently moving
     if (p->stepsRemaining == 0)
     {
-        return false;
+        return true;
     }
 
     (p->stepsRemaining)--;
 
-    if (p->repeat == false)
-    {
-        Attributes::RemainingTime::Set(p->endpoint, p->stepsRemaining);
-    }
-
     // are we going up or down?
     if ((p->isEnhancedHue && p->finalEnhancedHue == p->currentEnhancedHue) || (!p->isEnhancedHue && p->finalHue == p->currentHue))
     {
@@ -789,17 +816,20 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
                                         uint8_t moveMode, uint16_t rate, uint8_t optionsMask, uint8_t optionsOverride,
                                         bool isEnhanced)
 {
-    EndpointId endpoint = commandPath.mEndpointId;
-
-    uint8_t currentHue          = 0;
-    uint16_t currentEnhancedHue = 0;
-    Status status               = Status::Success;
-
-    ColorHueTransitionState * colorHueTransitionState        = getColorHueTransitionState(endpoint);
-    Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
+    EndpointId endpoint                               = commandPath.mEndpointId;
+    Status status                                     = Status::Success;
+    ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
 
     VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
-    VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
+
+    // check moveMode before any operation is done on the transition states
+    if ((rate == 0 && moveMode != EMBER_ZCL_HUE_MOVE_MODE_STOP) ||
+        (moveMode != EMBER_ZCL_HUE_MOVE_MODE_STOP && moveMode != EMBER_ZCL_HUE_MOVE_MODE_UP &&
+         moveMode != EMBER_ZCL_HUE_MOVE_MODE_DOWN))
+    {
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
 
     if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
@@ -809,9 +839,14 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
 
     // New command.  Need to stop any active transitions.
     stopAllColorTransitions(endpoint);
+    // now, kick off the state machine.
+    initHueTransitionState(endpoint, colorHueTransitionState, isEnhanced);
 
     if (moveMode == EMBER_ZCL_HUE_MOVE_MODE_STOP)
     {
+        // Per spec any saturation transition must also be cancelled.
+        Color16uTransitionState * saturationState = getSaturationTransitionState(endpoint);
+        initSaturationTransitionState(endpoint, saturationState);
         commandObj->AddStatus(commandPath, Status::Success);
         return true;
     }
@@ -826,32 +861,15 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
         handleModeSwitch(endpoint, ColorControlServer::ColorMode::COLOR_MODE_HSV);
     }
 
-    // now, kick off the state machine.
-    initHueSat(endpoint, colorHueTransitionState, colorSaturationTransitionState);
-
-    colorHueTransitionState->isEnhancedHue = isEnhanced;
-    if (isEnhanced)
-    {
-        Attributes::EnhancedCurrentHue::Get(endpoint, &currentEnhancedHue);
-        colorHueTransitionState->initialEnhancedHue = currentEnhancedHue;
-        colorHueTransitionState->currentEnhancedHue = currentEnhancedHue;
-    }
-    else
-    {
-        Attributes::CurrentHue::Get(endpoint, &currentHue);
-        colorHueTransitionState->initialHue = currentHue;
-        colorHueTransitionState->currentHue = currentHue;
-    }
-
     if (moveMode == EMBER_ZCL_HUE_MOVE_MODE_UP)
     {
         if (isEnhanced)
         {
-            colorHueTransitionState->finalEnhancedHue = addEnhancedHue(currentEnhancedHue, rate);
+            colorHueTransitionState->finalEnhancedHue = addEnhancedHue(colorHueTransitionState->currentEnhancedHue, rate);
         }
         else
         {
-            colorHueTransitionState->finalHue = addHue(currentHue, static_cast<uint8_t>(rate));
+            colorHueTransitionState->finalHue = addHue(colorHueTransitionState->currentHue, static_cast<uint8_t>(rate));
         }
 
         colorHueTransitionState->up = true;
@@ -860,20 +878,16 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
     {
         if (isEnhanced)
         {
-            colorHueTransitionState->finalEnhancedHue = subtractEnhancedHue(currentEnhancedHue, rate);
+            colorHueTransitionState->finalEnhancedHue = subtractEnhancedHue(colorHueTransitionState->currentEnhancedHue, rate);
         }
         else
         {
-            colorHueTransitionState->finalHue = subtractHue(currentHue, static_cast<uint8_t>(rate));
+            colorHueTransitionState->finalHue = subtractHue(colorHueTransitionState->currentHue, static_cast<uint8_t>(rate));
         }
 
         colorHueTransitionState->up = false;
     }
-    else
-    {
-        commandObj->AddStatus(commandPath, Status::InvalidAction);
-        return true;
-    }
+
     colorHueTransitionState->stepsRemaining = TRANSITION_TIME_1S;
     colorHueTransitionState->stepsTotal     = TRANSITION_TIME_1S;
     colorHueTransitionState->endpoint       = endpoint;
@@ -881,7 +895,6 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
 
     // hue movement can last forever. Indicate this with a remaining time of maxint
     Attributes::RemainingTime::Set(endpoint, MAX_INT16U_VALUE);
-    colorSaturationTransitionState->stepsRemaining = 0;
 
     // kick off the state machine:
     scheduleTimerCallbackMs(configureHSVEventControl(endpoint), UPDATE_TIME_MS);
@@ -915,15 +928,15 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
     uint16_t currentHue = 0;
     uint8_t direction;
 
-    ColorHueTransitionState * colorHueTransitionState        = getColorHueTransitionState(endpoint);
-    Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
+    ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
 
     VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
-    VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
-    if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
+    // Standard Hue limit checking:  hue is 0..254.  Spec dictates we ignore
+    // this and report a constraint error.
+    if (!isEnhanced && (hue > MAX_HUE_VALUE))
     {
-        commandObj->AddStatus(commandPath, Status::Success);
+        commandObj->AddStatus(commandPath, Status::ConstraintError);
         return true;
     }
 
@@ -944,14 +957,6 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
         transitionTime++;
     }
 
-    // Standard Hue limit checking:  hue is 0..254.  Spec dictates we ignore
-    // this and report a malformed packet.
-    if (!isEnhanced && (hue > MAX_HUE_VALUE))
-    {
-        commandObj->AddStatus(commandPath, Status::InvalidAction);
-        return true;
-    }
-
     // For move to hue, the move modes are different from the other move commands.
     // Need to translate from the move to hue transitions to the internal
     // representation.
@@ -986,7 +991,13 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
         direction = MOVE_MODE_DOWN;
         break;
     default:
-        commandObj->AddStatus(commandPath, Status::InvalidAction);
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
+
+    if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
+    {
+        commandObj->AddStatus(commandPath, Status::Success);
         return true;
     }
 
@@ -1004,32 +1015,24 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
     }
 
     // now, kick off the state machine.
-    initHueSat(endpoint, colorHueTransitionState, colorSaturationTransitionState);
-    colorHueTransitionState->isEnhancedHue = isEnhanced;
+    initHueTransitionState(endpoint, colorHueTransitionState, isEnhanced);
 
     if (isEnhanced)
     {
-        Attributes::EnhancedCurrentHue::Get(endpoint, &(colorHueTransitionState->initialEnhancedHue));
-        Attributes::EnhancedCurrentHue::Get(endpoint, &(colorHueTransitionState->currentEnhancedHue));
-
         colorHueTransitionState->finalEnhancedHue = hue;
     }
     else
     {
-        Attributes::CurrentHue::Get(endpoint, &(colorHueTransitionState->initialHue));
-        Attributes::CurrentHue::Get(endpoint, &(colorHueTransitionState->currentHue));
-
         colorHueTransitionState->finalHue = static_cast<uint8_t>(hue);
     }
 
-    colorHueTransitionState->stepsRemaining        = transitionTime;
-    colorHueTransitionState->stepsTotal            = transitionTime;
-    colorHueTransitionState->endpoint              = endpoint;
-    colorHueTransitionState->up                    = (direction == MOVE_MODE_UP);
-    colorHueTransitionState->repeat                = false;
-    colorSaturationTransitionState->stepsRemaining = 0;
+    colorHueTransitionState->stepsRemaining = transitionTime;
+    colorHueTransitionState->stepsTotal     = transitionTime;
+    colorHueTransitionState->endpoint       = endpoint;
+    colorHueTransitionState->up             = (direction == MOVE_MODE_UP);
+    colorHueTransitionState->repeat         = false;
 
-    Attributes::RemainingTime::Set(endpoint, transitionTime);
+    SetHSVRemainingTime(endpoint);
 
     // kick off the state machine:
     scheduleTimerCallbackMs(configureHSVEventControl(endpoint), UPDATE_TIME_MS);
@@ -1071,28 +1074,11 @@ bool ColorControlServer::moveToHueAndSaturationCommand(app::CommandHandler * com
     VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
     VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
-    if (isEnhanced)
-    {
-        Attributes::EnhancedCurrentHue::Get(endpoint, &currentHue);
-    }
-    else
-    {
-        uint8_t current8bitHue = 0;
-        Attributes::CurrentHue::Get(endpoint, &current8bitHue);
-
-        currentHue = static_cast<uint16_t>(current8bitHue);
-    }
-
-    if (transitionTime == 0)
-    {
-        transitionTime++;
-    }
-
     // limit checking:  hue and saturation are 0..254.  Spec dictates we ignore
-    // this and report a malformed packet.
+    // this and report a constraint error.
     if ((!isEnhanced && hue > MAX_HUE_VALUE) || saturation > MAX_SATURATION_VALUE)
     {
-        commandObj->AddStatus(commandPath, Status::InvalidAction);
+        commandObj->AddStatus(commandPath, Status::ConstraintError);
         return true;
     }
 
@@ -1102,14 +1088,9 @@ bool ColorControlServer::moveToHueAndSaturationCommand(app::CommandHandler * com
         return true;
     }
 
-    // compute shortest direction
-    if (hue > currentHue)
-    {
-        moveUp = (hue - currentHue) < halfWay;
-    }
-    else
+    if (transitionTime == 0)
     {
-        moveUp = (currentHue - hue) > halfWay;
+        transitionTime++;
     }
 
     // New command.  Need to stop any active transitions.
@@ -1126,30 +1107,36 @@ bool ColorControlServer::moveToHueAndSaturationCommand(app::CommandHandler * com
     }
 
     // now, kick off the state machine.
-    initHueSat(endpoint, colorHueTransitionState, colorSaturationTransitionState);
-    colorHueTransitionState->isEnhancedHue = isEnhanced;
+    initHueTransitionState(endpoint, colorHueTransitionState, isEnhanced);
 
     if (isEnhanced)
     {
-        colorHueTransitionState->initialEnhancedHue = currentHue;
-        colorHueTransitionState->currentEnhancedHue = currentHue;
-        colorHueTransitionState->finalEnhancedHue   = hue;
+        currentHue                                = colorHueTransitionState->currentEnhancedHue;
+        colorHueTransitionState->finalEnhancedHue = hue;
     }
     else
     {
-        colorHueTransitionState->initialHue = static_cast<uint8_t>(currentHue);
-        colorHueTransitionState->currentHue = static_cast<uint8_t>(currentHue);
-        colorHueTransitionState->finalHue   = static_cast<uint8_t>(hue);
+        currentHue                        = static_cast<uint16_t>(colorHueTransitionState->currentHue);
+        colorHueTransitionState->finalHue = static_cast<uint8_t>(hue);
     }
 
+    // compute shortest direction
+    if (hue > currentHue)
+    {
+        moveUp = (hue - currentHue) < halfWay;
+    }
+    else
+    {
+        moveUp = (currentHue - hue) > halfWay;
+    }
+
+    colorHueTransitionState->up             = moveUp;
     colorHueTransitionState->stepsRemaining = transitionTime;
     colorHueTransitionState->stepsTotal     = transitionTime;
     colorHueTransitionState->endpoint       = endpoint;
-    colorHueTransitionState->up             = moveUp;
     colorHueTransitionState->repeat         = false;
 
-    colorSaturationTransitionState->initialValue   = getSaturation(endpoint);
-    colorSaturationTransitionState->currentValue   = getSaturation(endpoint);
+    initSaturationTransitionState(endpoint, colorSaturationTransitionState);
     colorSaturationTransitionState->finalValue     = saturation;
     colorSaturationTransitionState->stepsRemaining = transitionTime;
     colorSaturationTransitionState->stepsTotal     = transitionTime;
@@ -1157,7 +1144,7 @@ bool ColorControlServer::moveToHueAndSaturationCommand(app::CommandHandler * com
     colorSaturationTransitionState->lowLimit       = MIN_SATURATION_VALUE;
     colorSaturationTransitionState->highLimit      = MAX_SATURATION_VALUE;
 
-    Attributes::RemainingTime::Set(endpoint, transitionTime);
+    SetHSVRemainingTime(endpoint);
 
     // kick off the state machine:
     scheduleTimerCallbackMs(configureHSVEventControl(endpoint), UPDATE_TIME_MS);
@@ -1189,11 +1176,15 @@ bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const
 
     Status status = Status::Success;
 
-    ColorHueTransitionState * colorHueTransitionState        = getColorHueTransitionState(endpoint);
-    Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
-
+    ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
     VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
-    VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
+
+    // Confirm validity of the step mode received
+    if (stepMode != STEP_MODE_STOP && stepMode != STEP_MODE_UP && stepMode != STEP_MODE_DOWN)
+    {
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
 
     if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
@@ -1209,7 +1200,7 @@ bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const
     // New command.  Need to stop any active transitions.
     stopAllColorTransitions(endpoint);
 
-    if (stepMode == MOVE_MODE_STOP)
+    if (stepMode == STEP_MODE_STOP)
     {
         commandObj->AddStatus(commandPath, Status::Success);
         return true;
@@ -1226,20 +1217,17 @@ bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const
     }
 
     // now, kick off the state machine.
-    initHueSat(endpoint, colorHueTransitionState, colorSaturationTransitionState);
-    colorHueTransitionState->isEnhancedHue = isEnhanced;
+    initHueTransitionState(endpoint, colorHueTransitionState, isEnhanced);
 
     if (isEnhanced)
     {
-        Attributes::EnhancedCurrentHue::Get(endpoint, &(colorHueTransitionState->currentEnhancedHue));
-        colorHueTransitionState->initialEnhancedHue = colorHueTransitionState->currentEnhancedHue;
 
-        if (stepMode == MOVE_MODE_UP)
+        if (stepMode == STEP_MODE_UP)
         {
             colorHueTransitionState->finalEnhancedHue = addEnhancedHue(colorHueTransitionState->currentEnhancedHue, stepSize);
             colorHueTransitionState->up               = true;
         }
-        else
+        else if (stepMode == STEP_MODE_DOWN)
         {
             colorHueTransitionState->finalEnhancedHue = subtractEnhancedHue(colorHueTransitionState->currentEnhancedHue, stepSize);
             colorHueTransitionState->up               = false;
@@ -1247,28 +1235,24 @@ bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const
     }
     else
     {
-        Attributes::CurrentHue::Get(endpoint, &(colorHueTransitionState->currentHue));
-        colorHueTransitionState->initialHue = colorHueTransitionState->currentHue;
-
         if (stepMode == MOVE_MODE_UP)
         {
             colorHueTransitionState->finalHue = addHue(colorHueTransitionState->currentHue, static_cast<uint8_t>(stepSize));
             colorHueTransitionState->up       = true;
         }
-        else
+        else if (stepMode == STEP_MODE_DOWN)
         {
             colorHueTransitionState->finalHue = subtractHue(colorHueTransitionState->currentHue, static_cast<uint8_t>(stepSize));
             colorHueTransitionState->up       = false;
         }
     }
 
-    colorHueTransitionState->stepsRemaining        = transitionTime;
-    colorHueTransitionState->stepsTotal            = transitionTime;
-    colorHueTransitionState->endpoint              = endpoint;
-    colorHueTransitionState->repeat                = false;
-    colorSaturationTransitionState->stepsRemaining = 0;
+    colorHueTransitionState->stepsRemaining = transitionTime;
+    colorHueTransitionState->stepsTotal     = transitionTime;
+    colorHueTransitionState->endpoint       = endpoint;
+    colorHueTransitionState->repeat         = false;
 
-    Attributes::RemainingTime::Set(endpoint, transitionTime);
+    SetHSVRemainingTime(endpoint);
 
     // kick off the state machine:
     scheduleTimerCallbackMs(configureHSVEventControl(endpoint), UPDATE_TIME_MS);
@@ -1288,12 +1272,18 @@ bool ColorControlServer::moveSaturationCommand(app::CommandHandler * commandObj,
     EndpointId endpoint    = commandPath.mEndpointId;
     Status status          = Status::Success;
 
-    ColorHueTransitionState * colorHueTransitionState        = getColorHueTransitionState(endpoint);
     Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
-
-    VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
     VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
+    // check moveMode before any operation is done on the transition states
+    if ((rate == 0 && moveMode != EMBER_ZCL_SATURATION_MOVE_MODE_STOP) ||
+        (moveMode != EMBER_ZCL_SATURATION_MOVE_MODE_STOP && moveMode != EMBER_ZCL_SATURATION_MOVE_MODE_UP &&
+         moveMode != EMBER_ZCL_SATURATION_MOVE_MODE_DOWN))
+    {
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
+
     if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
         commandObj->AddStatus(commandPath, Status::Success);
@@ -1305,8 +1295,14 @@ bool ColorControlServer::moveSaturationCommand(app::CommandHandler * commandObj,
     // New command.  Need to stop any active transitions.
     stopAllColorTransitions(endpoint);
 
-    if (moveMode == EMBER_ZCL_SATURATION_MOVE_MODE_STOP || rate == 0)
+    // now, kick off the state machine.
+    initSaturationTransitionState(endpoint, colorSaturationTransitionState);
+
+    if (moveMode == EMBER_ZCL_SATURATION_MOVE_MODE_STOP)
     {
+        // Per spec any hue transition must also be cancelled.
+        ColorHueTransitionState * hueState = getColorHueTransitionState(endpoint);
+        initHueTransitionState(endpoint, hueState, false /*isEnhancedHue don't care*/);
         commandObj->AddStatus(commandPath, Status::Success);
         return true;
     }
@@ -1314,18 +1310,11 @@ bool ColorControlServer::moveSaturationCommand(app::CommandHandler * commandObj,
     // Handle color mode transition, if necessary.
     handleModeSwitch(endpoint, COLOR_MODE_HSV);
 
-    // now, kick off the state machine.
-    initHueSat(endpoint, colorHueTransitionState, colorSaturationTransitionState);
-
-    colorHueTransitionState->stepsRemaining = 0;
-
-    colorSaturationTransitionState->initialValue = getSaturation(endpoint);
-    colorSaturationTransitionState->currentValue = getSaturation(endpoint);
     if (moveMode == EMBER_ZCL_SATURATION_MOVE_MODE_UP)
     {
         colorSaturationTransitionState->finalValue = MAX_SATURATION_VALUE;
     }
-    else
+    else if (moveMode == EMBER_ZCL_SATURATION_MOVE_MODE_DOWN)
     {
         colorSaturationTransitionState->finalValue = MIN_SATURATION_VALUE;
     }
@@ -1338,7 +1327,7 @@ bool ColorControlServer::moveSaturationCommand(app::CommandHandler * commandObj,
     colorSaturationTransitionState->lowLimit       = MIN_SATURATION_VALUE;
     colorSaturationTransitionState->highLimit      = MAX_SATURATION_VALUE;
 
-    Attributes::RemainingTime::Set(endpoint, transitionTime);
+    SetHSVRemainingTime(endpoint);
 
     // kick off the state machine:
     scheduleTimerCallbackMs(configureHSVEventControl(endpoint), UPDATE_TIME_MS);
@@ -1368,12 +1357,17 @@ bool ColorControlServer::moveToSaturationCommand(app::CommandHandler * commandOb
     EndpointId endpoint     = commandPath.mEndpointId;
     Status status           = Status::Success;
 
-    ColorHueTransitionState * colorHueTransitionState        = getColorHueTransitionState(endpoint);
     Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
-
-    VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
     VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
+    // limit checking:  hue and saturation are 0..254.  Spec dictates we ignore
+    // this and report a malformed packet.
+    if (saturation > MAX_SATURATION_VALUE)
+    {
+        commandObj->AddStatus(commandPath, Status::ConstraintError);
+        return true;
+    }
+
     if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
         commandObj->AddStatus(commandPath, Status::Success);
@@ -1385,14 +1379,6 @@ bool ColorControlServer::moveToSaturationCommand(app::CommandHandler * commandOb
         transitionTime++;
     }
 
-    // limit checking:  hue and saturation are 0..254.  Spec dictates we ignore
-    // this and report a malformed packet.
-    if (saturation > MAX_SATURATION_VALUE)
-    {
-        commandObj->AddStatus(commandPath, Status::InvalidAction);
-        return true;
-    }
-
     // New command.  Need to stop any active transitions.
     stopAllColorTransitions(endpoint);
 
@@ -1400,12 +1386,7 @@ bool ColorControlServer::moveToSaturationCommand(app::CommandHandler * commandOb
     handleModeSwitch(endpoint, COLOR_MODE_HSV);
 
     // now, kick off the state machine.
-    initHueSat(endpoint, colorHueTransitionState, colorSaturationTransitionState);
-
-    colorHueTransitionState->stepsRemaining = 0;
-
-    colorSaturationTransitionState->initialValue   = getSaturation(endpoint);
-    colorSaturationTransitionState->currentValue   = getSaturation(endpoint);
+    initSaturationTransitionState(endpoint, colorSaturationTransitionState);
     colorSaturationTransitionState->finalValue     = saturation;
     colorSaturationTransitionState->stepsRemaining = transitionTime;
     colorSaturationTransitionState->stepsTotal     = transitionTime;
@@ -1413,7 +1394,7 @@ bool ColorControlServer::moveToSaturationCommand(app::CommandHandler * commandOb
     colorSaturationTransitionState->lowLimit       = MIN_SATURATION_VALUE;
     colorSaturationTransitionState->highLimit      = MAX_SATURATION_VALUE;
 
-    Attributes::RemainingTime::Set(endpoint, transitionTime);
+    SetHSVRemainingTime(endpoint);
 
     // kick off the state machine:
     scheduleTimerCallbackMs(configureHSVEventControl(endpoint), UPDATE_TIME_MS);
@@ -1435,20 +1416,22 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
     Status status             = Status::Success;
     uint8_t currentSaturation = 0;
 
-    ColorHueTransitionState * colorHueTransitionState        = getColorHueTransitionState(endpoint);
     Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
-
-    VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
     VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
+    // Confirm validity of the step mode received
+    if (stepMode != STEP_MODE_STOP && stepMode != STEP_MODE_UP && stepMode != STEP_MODE_DOWN)
+    {
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
+
     if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
         commandObj->AddStatus(commandPath, Status::Success);
         return true;
     }
 
-    currentSaturation = getSaturation(endpoint);
-
     if (transitionTime == 0)
     {
         transitionTime++;
@@ -1467,18 +1450,14 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
     handleModeSwitch(endpoint, COLOR_MODE_HSV);
 
     // now, kick off the state machine.
-    initHueSat(endpoint, colorHueTransitionState, colorSaturationTransitionState);
-
-    colorHueTransitionState->stepsRemaining = 0;
-
-    colorSaturationTransitionState->initialValue = currentSaturation;
-    colorSaturationTransitionState->currentValue = currentSaturation;
+    initSaturationTransitionState(endpoint, colorSaturationTransitionState);
+    currentSaturation = static_cast<uint8_t>(colorSaturationTransitionState->currentValue);
 
     if (stepMode == MOVE_MODE_UP)
     {
         colorSaturationTransitionState->finalValue = addSaturation(currentSaturation, stepSize);
     }
-    else
+    else if (stepMode == MOVE_MODE_DOWN)
     {
         colorSaturationTransitionState->finalValue = subtractSaturation(currentSaturation, stepSize);
     }
@@ -1488,7 +1467,7 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
     colorSaturationTransitionState->lowLimit       = MIN_SATURATION_VALUE;
     colorSaturationTransitionState->highLimit      = MAX_SATURATION_VALUE;
 
-    Attributes::RemainingTime::Set(endpoint, transitionTime);
+    SetHSVRemainingTime(endpoint);
 
     // kick off the state machine:
     scheduleTimerCallbackMs(configureHSVEventControl(endpoint), UPDATE_TIME_MS);
@@ -1516,6 +1495,16 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
     ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
     VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
+    // Validate the action and direction parameters of the command
+    if ((action != EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE &&
+         action != EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE &&
+         action != EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE) ||
+        (direction != DECREMENT_HUE && direction != INCREMENT_HUE))
+    {
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
+
     if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
         commandObj->AddStatus(commandPath, Status::Success);
@@ -1603,11 +1592,6 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
         {
             startColorLoop(endpoint, false);
         }
-        else
-        {
-            commandObj->AddStatus(commandPath, Status::InvalidAction);
-            return true;
-        }
     }
 
 exit:
@@ -1622,15 +1606,19 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
  */
 void ColorControlServer::updateHueSatCommand(EndpointId endpoint)
 {
-    bool limitReached1, limitReached2;
-
     ColorHueTransitionState * colorHueTransitionState        = getColorHueTransitionState(endpoint);
     Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
 
-    limitReached1 = computeNewHueValue(colorHueTransitionState);
-    limitReached2 = computeNewColor16uValue(colorSaturationTransitionState);
+    uint8_t previousHue          = colorHueTransitionState->currentHue;
+    uint16_t previousSaturation  = colorSaturationTransitionState->currentValue;
+    uint16_t previousEnhancedhue = colorHueTransitionState->currentEnhancedHue;
+
+    bool isHueTansitionDone         = computeNewHueValue(colorHueTransitionState);
+    bool isSaturationTransitionDone = computeNewColor16uValue(colorSaturationTransitionState);
 
-    if (limitReached1 || limitReached2)
+    SetHSVRemainingTime(endpoint);
+
+    if (isHueTansitionDone && isSaturationTransitionDone)
     {
         stopAllColorTransitions(endpoint);
     }
@@ -1641,26 +1629,30 @@ void ColorControlServer::updateHueSatCommand(EndpointId endpoint)
 
     if (colorHueTransitionState->isEnhancedHue)
     {
-        Attributes::EnhancedCurrentHue::Set(endpoint, colorHueTransitionState->currentEnhancedHue);
-        Attributes::CurrentHue::Set(endpoint, static_cast<uint8_t>(colorHueTransitionState->currentEnhancedHue >> 8));
+        if (previousEnhancedhue != colorHueTransitionState->currentEnhancedHue)
+        {
+            Attributes::EnhancedCurrentHue::Set(endpoint, colorHueTransitionState->currentEnhancedHue);
+            Attributes::CurrentHue::Set(endpoint, static_cast<uint8_t>(colorHueTransitionState->currentEnhancedHue >> 8));
+
+            emberAfColorControlClusterPrintln("Enhanced Hue %d endpoint %d", colorHueTransitionState->currentEnhancedHue, endpoint);
+        }
     }
     else
     {
-        Attributes::CurrentHue::Set(colorHueTransitionState->endpoint, colorHueTransitionState->currentHue);
+        if (previousHue != colorHueTransitionState->currentHue)
+        {
+            Attributes::CurrentHue::Set(colorHueTransitionState->endpoint, colorHueTransitionState->currentHue);
+            emberAfColorControlClusterPrintln("Hue %d endpoint %d", colorHueTransitionState->currentHue, endpoint);
+        }
     }
 
-    Attributes::CurrentSaturation::Set(colorSaturationTransitionState->endpoint,
-                                       (uint8_t) colorSaturationTransitionState->currentValue);
-    if (colorHueTransitionState->isEnhancedHue)
-    {
-        emberAfColorControlClusterPrintln("Enhanced Hue %d Saturation %d endpoint %d", colorHueTransitionState->currentEnhancedHue,
-                                          colorSaturationTransitionState->currentValue, endpoint);
-    }
-    else
+    if (previousSaturation != colorSaturationTransitionState->currentValue)
     {
-        emberAfColorControlClusterPrintln("Hue %d Saturation %d endpoint %d", colorHueTransitionState->currentHue,
-                                          colorSaturationTransitionState->currentValue, endpoint);
+        Attributes::CurrentSaturation::Set(colorSaturationTransitionState->endpoint,
+                                           (uint8_t) colorSaturationTransitionState->currentValue);
+        emberAfColorControlClusterPrintln("Saturation %d endpoint %d", colorSaturationTransitionState->currentValue, endpoint);
     }
+
     computePwmFromHsv(endpoint);
 }
 
@@ -1984,14 +1976,15 @@ void ColorControlServer::updateXYCommand(EndpointId endpoint)
 {
     Color16uTransitionState * colorXTransitionState = getXTransitionState(endpoint);
     Color16uTransitionState * colorYTransitionState = getYTransitionState(endpoint);
-    bool limitReachedX, limitReachedY;
+    bool isXTransitionDone, isYTransitionDone;
 
     // compute new values for X and Y.
-    limitReachedX = computeNewColor16uValue(colorXTransitionState);
+    isXTransitionDone = computeNewColor16uValue(colorXTransitionState);
+    isYTransitionDone = computeNewColor16uValue(colorYTransitionState);
 
-    limitReachedY = computeNewColor16uValue(colorYTransitionState);
+    Attributes::RemainingTime::Set(endpoint, max(colorXTransitionState->stepsRemaining, colorYTransitionState->stepsRemaining));
 
-    if (limitReachedX || limitReachedY)
+    if (isXTransitionDone && isYTransitionDone)
     {
         stopAllColorTransitions(endpoint);
     }
@@ -2187,11 +2180,13 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint)
 void ColorControlServer::updateTempCommand(EndpointId endpoint)
 {
     Color16uTransitionState * colorTempTransitionState = getTempTransitionState(endpoint);
-    bool limitReached;
+    bool isColorTempTransitionDone;
+
+    isColorTempTransitionDone = computeNewColor16uValue(colorTempTransitionState);
 
-    limitReached = computeNewColor16uValue(colorTempTransitionState);
+    Attributes::RemainingTime::Set(endpoint, colorTempTransitionState->stepsRemaining);
 
-    if (limitReached)
+    if (isColorTempTransitionDone)
     {
         stopAllColorTransitions(endpoint);
     }
@@ -2237,6 +2232,14 @@ bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj,
     Color16uTransitionState * colorTempTransitionState = getTempTransitionState(endpoint);
     VerifyOrExit(colorTempTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
+    // check moveMode before any operation is done on the transition states
+    if ((rate == 0 && moveMode != MOVE_MODE_STOP) ||
+        (moveMode != MOVE_MODE_STOP && moveMode != MOVE_MODE_UP && moveMode != MOVE_MODE_DOWN))
+    {
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
+
     if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
         commandObj->AddStatus(commandPath, Status::Success);
@@ -2255,12 +2258,6 @@ bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj,
         return true;
     }
 
-    if (rate == 0)
-    {
-        commandObj->AddStatus(commandPath, Status::InvalidCommand);
-        return true;
-    }
-
     if (colorTemperatureMinimum < tempPhysicalMin)
     {
         colorTemperatureMinimum = tempPhysicalMin;
@@ -2356,18 +2353,17 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
     Color16uTransitionState * colorTempTransitionState = getTempTransitionState(endpoint);
     VerifyOrExit(colorTempTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
-    if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
+    // Confirm validity of the step mode received
+    if (stepMode != STEP_MODE_STOP && stepMode != STEP_MODE_UP && stepMode != STEP_MODE_DOWN)
     {
-        commandObj->AddStatus(commandPath, Status::Success);
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
         return true;
     }
 
-    Attributes::ColorTempPhysicalMinMireds::Get(endpoint, &tempPhysicalMin);
-    Attributes::ColorTempPhysicalMaxMireds::Get(endpoint, &tempPhysicalMax);
-
-    if (transitionTime == 0)
+    if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
-        transitionTime++;
+        commandObj->AddStatus(commandPath, Status::Success);
+        return true;
     }
 
     // New command.  Need to stop any active transitions.
@@ -2379,6 +2375,14 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
         return true;
     }
 
+    Attributes::ColorTempPhysicalMinMireds::Get(endpoint, &tempPhysicalMin);
+    Attributes::ColorTempPhysicalMaxMireds::Get(endpoint, &tempPhysicalMax);
+
+    if (transitionTime == 0)
+    {
+        transitionTime++;
+    }
+
     if (colorTemperatureMinimum < tempPhysicalMin)
     {
         colorTemperatureMinimum = tempPhysicalMin;
@@ -2396,7 +2400,7 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
     Attributes::ColorTemperatureMireds::Get(endpoint, &colorTempTransitionState->initialValue);
     colorTempTransitionState->currentValue = colorTempTransitionState->initialValue;
 
-    if (stepMode == MOVE_MODE_UP)
+    if (stepMode == STEP_MODE_UP)
     {
         uint32_t finalValue32u = static_cast<uint32_t>(colorTempTransitionState->initialValue) + static_cast<uint32_t>(stepSize);
         if (finalValue32u > UINT16_MAX)
@@ -2408,7 +2412,7 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
             colorTempTransitionState->finalValue = static_cast<uint16_t>(finalValue32u);
         }
     }
-    else
+    else if (stepMode == STEP_MODE_DOWN)
     {
         uint32_t finalValue32u = static_cast<uint32_t>(colorTempTransitionState->initialValue) - static_cast<uint32_t>(stepSize);
         if (finalValue32u > UINT16_MAX)
diff --git a/src/app/clusters/color-control-server/color-control-server.h b/src/app/clusters/color-control-server/color-control-server.h
index df4bcd143a29de..792d504e8dca73 100644
--- a/src/app/clusters/color-control-server/color-control-server.h
+++ b/src/app/clusters/color-control-server/color-control-server.h
@@ -74,6 +74,19 @@ class ColorControlServer
         MOVE_MODE_DOWN = 0x03
     };
 
+    enum StepMode
+    {
+        STEP_MODE_STOP = 0x00,
+        STEP_MODE_UP   = 0x01,
+        STEP_MODE_DOWN = 0x03
+    };
+
+    enum ColorLoopDirection
+    {
+        DECREMENT_HUE = 0x00,
+        INCREMENT_HUE = 0x01,
+    };
+
     enum ColorMode
     {
         COLOR_MODE_HSV         = 0x00,
@@ -216,8 +229,9 @@ class ColorControlServer
     uint16_t addEnhancedHue(uint16_t hue1, uint16_t hue2);
     uint16_t subtractEnhancedHue(uint16_t hue1, uint16_t hue2);
     void startColorLoop(chip::EndpointId endpoint, uint8_t startFromStartHue);
-    void initHueSat(chip::EndpointId endpoint, ColorHueTransitionState * colorHueTransitionState,
-                    Color16uTransitionState * colorSatTransitionState);
+    void initHueTransitionState(chip::EndpointId endpoint, ColorHueTransitionState * colorHueTransitionState, bool isEnhancedHue);
+    void initSaturationTransitionState(chip::EndpointId endpoint, Color16uTransitionState * colorSatTransitionState);
+    void SetHSVRemainingTime(chip::EndpointId endpoint);
     bool computeNewHueValue(ColorHueTransitionState * p);
     EmberEventControl * configureHSVEventControl(chip::EndpointId);
 #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
diff --git a/src/app/clusters/wifi-network-diagnostics-server/wifi-network-diagnostics-server.cpp b/src/app/clusters/wifi-network-diagnostics-server/wifi-network-diagnostics-server.cpp
index dc6e751b0d5f4b..d3e6a86fdd281d 100644
--- a/src/app/clusters/wifi-network-diagnostics-server/wifi-network-diagnostics-server.cpp
+++ b/src/app/clusters/wifi-network-diagnostics-server/wifi-network-diagnostics-server.cpp
@@ -119,12 +119,12 @@ CHIP_ERROR WiFiDiagosticsAttrAccess::ReadSecurityType(AttributeValueEncoder & aE
 CHIP_ERROR WiFiDiagosticsAttrAccess::ReadWiFiVersion(AttributeValueEncoder & aEncoder)
 {
     Attributes::WiFiVersion::TypeInfo::Type version;
-    uint8_t value = 0;
+    WiFiVersionEnum value = WiFiVersionEnum::kUnknownEnumValue;
 
     if (DeviceLayer::GetDiagnosticDataProvider().GetWiFiVersion(value) == CHIP_NO_ERROR)
     {
-        version.SetNonNull(static_cast<WiFiNetworkDiagnostics::WiFiVersionEnum>(value));
-        ChipLogProgress(Zcl, "The current 802.11 standard version in use by the Node: %d", value);
+        version.SetNonNull(value);
+        ChipLogProgress(Zcl, "The current 802.11 standard version in use by the Node: %d", to_underlying(value));
     }
     else
     {
diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
index 980d020a3c7bc6..0b06dc6c070101 100644
--- a/src/app/server/CommissioningWindowManager.cpp
+++ b/src/app/server/CommissioningWindowManager.cpp
@@ -234,6 +234,17 @@ CHIP_ERROR CommissioningWindowManager::OpenCommissioningWindow(Seconds16 commiss
 
     mCommissioningTimeoutTimerArmed = true;
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
+    // Block device role changing into Router if commissioning window opened and device not yet Router.
+    // AdvertiseAndListenForPASE fails doesn't matter, because if it does the callers of OpenCommissioningWindow
+    // will end up calling ResetState, which will reset the boolean.
+    if (ConnectivityManagerImpl().GetThreadDeviceType() == ConnectivityManager::kThreadDeviceType_Router)
+    {
+        ThreadStackMgr().SetRouterPromotion(false);
+        mRecoverRouterDeviceRole = true;
+    }
+#endif
+
     return AdvertiseAndListenForPASE();
 }
 
@@ -470,15 +481,6 @@ CHIP_ERROR CommissioningWindowManager::StartAdvertisement()
     // reset all advertising, switching to our new commissioning mode.
     app::DnssdServer::Instance().StartServer();
 
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
-    // Block device role changing into Router if commissioning window opened and device not yet Router.
-    if (ConnectivityManagerImpl().GetThreadDeviceType() == ConnectivityManager::kThreadDeviceType_Router)
-    {
-        ThreadStackMgr().SetRouterPromotion(false);
-        mRecoverRouterDeviceRole = true;
-    }
-#endif
-
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/app/tests/suites/TestBinding.yaml b/src/app/tests/suites/TestBinding.yaml
index 6ca70ad3d9c330..15f25cbb5f2365 100644
--- a/src/app/tests/suites/TestBinding.yaml
+++ b/src/app/tests/suites/TestBinding.yaml
@@ -104,3 +104,24 @@ tests:
                   { FabricIndex: 1, Node: 1, Endpoint: 1, Cluster: 6 },
                   { FabricIndex: 1, Node: 2, Endpoint: 1 },
               ]
+
+    - label: "Write over-long binding table on endpoint 1"
+      command: "writeAttribute"
+      attribute: "Binding"
+      arguments:
+          value:
+              [
+                  { FabricIndex: 0, Node: 1, Endpoint: 1, Cluster: 6 },
+                  { FabricIndex: 0, Node: 2, Endpoint: 2, Cluster: 6 },
+                  { FabricIndex: 0, Node: 3, Endpoint: 3, Cluster: 6 },
+                  { FabricIndex: 0, Node: 4, Endpoint: 4, Cluster: 6 },
+                  { FabricIndex: 0, Node: 5, Endpoint: 5, Cluster: 6 },
+                  { FabricIndex: 0, Node: 6, Endpoint: 6, Cluster: 6 },
+                  { FabricIndex: 0, Node: 7, Endpoint: 7, Cluster: 6 },
+                  { FabricIndex: 0, Node: 8, Endpoint: 8, Cluster: 6 },
+                  { FabricIndex: 0, Node: 9, Endpoint: 9, Cluster: 6 },
+                  { FabricIndex: 0, Node: 10, Endpoint: 10, Cluster: 6 },
+                  { FabricIndex: 0, Node: 11, Endpoint: 11, Cluster: 6 },
+              ]
+      response:
+          error: RESOURCE_EXHAUSTED
diff --git a/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp b/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
index bd7d644e47c555..50243e49dda5af 100644
--- a/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
+++ b/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
@@ -26,11 +26,12 @@
 #include <lib/support/BytesToHex.h>
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/Span.h>
+#include <platform/CHIPDeviceConfig.h>
 
 #include <fstream>
 
 //-> format_version = 1
-//-> vendor_id = 0xFFF1
+//-> vendor_id = 0xFFF1/0xFFF2/0xFFF3
 //-> product_id_array = [ 0x8000, 0x8001, 0x8002, 0x8003, 0x8004, 0x8005, 0x8006, 0x8007, 0x8008, 0x8009, 0x800A, 0x800B,
 // 0x800C, 0x800D, 0x800E, 0x800F, 0x8010, 0x8011, 0x8012, 0x8013, 0x8014, 0x8015, 0x8016, 0x8017, 0x8018, 0x8019, 0x801A,
 // 0x801B, 0x801C, 0x801D, 0x801E, 0x801F, 0x8020, 0x8021, 0x8022, 0x8023, 0x8024, 0x8025, 0x8026, 0x8027, 0x8028, 0x8029,
@@ -46,6 +47,65 @@
 //-> certification_type = 0
 //-> dac_origin_vendor_id is not present
 //-> dac_origin_product_id is not present
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2
+constexpr const uint8_t kCdForAllExamples[541] = {
+    0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30, 0x82,
+    0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30,
+    0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61, 0x04, 0x82, 0x01,
+    0x5d, 0x15, 0x24, 0x00, 0x01, 0x25, 0x01, 0xf2, 0xff, 0x36, 0x02, 0x05, 0x00, 0x80, 0x05, 0x01, 0x80, 0x05, 0x02, 0x80, 0x05,
+    0x03, 0x80, 0x05, 0x04, 0x80, 0x05, 0x05, 0x80, 0x05, 0x06, 0x80, 0x05, 0x07, 0x80, 0x05, 0x08, 0x80, 0x05, 0x09, 0x80, 0x05,
+    0x0a, 0x80, 0x05, 0x0b, 0x80, 0x05, 0x0c, 0x80, 0x05, 0x0d, 0x80, 0x05, 0x0e, 0x80, 0x05, 0x0f, 0x80, 0x05, 0x10, 0x80, 0x05,
+    0x11, 0x80, 0x05, 0x12, 0x80, 0x05, 0x13, 0x80, 0x05, 0x14, 0x80, 0x05, 0x15, 0x80, 0x05, 0x16, 0x80, 0x05, 0x17, 0x80, 0x05,
+    0x18, 0x80, 0x05, 0x19, 0x80, 0x05, 0x1a, 0x80, 0x05, 0x1b, 0x80, 0x05, 0x1c, 0x80, 0x05, 0x1d, 0x80, 0x05, 0x1e, 0x80, 0x05,
+    0x1f, 0x80, 0x05, 0x20, 0x80, 0x05, 0x21, 0x80, 0x05, 0x22, 0x80, 0x05, 0x23, 0x80, 0x05, 0x24, 0x80, 0x05, 0x25, 0x80, 0x05,
+    0x26, 0x80, 0x05, 0x27, 0x80, 0x05, 0x28, 0x80, 0x05, 0x29, 0x80, 0x05, 0x2a, 0x80, 0x05, 0x2b, 0x80, 0x05, 0x2c, 0x80, 0x05,
+    0x2d, 0x80, 0x05, 0x2e, 0x80, 0x05, 0x2f, 0x80, 0x05, 0x30, 0x80, 0x05, 0x31, 0x80, 0x05, 0x32, 0x80, 0x05, 0x33, 0x80, 0x05,
+    0x34, 0x80, 0x05, 0x35, 0x80, 0x05, 0x36, 0x80, 0x05, 0x37, 0x80, 0x05, 0x38, 0x80, 0x05, 0x39, 0x80, 0x05, 0x3a, 0x80, 0x05,
+    0x3b, 0x80, 0x05, 0x3c, 0x80, 0x05, 0x3d, 0x80, 0x05, 0x3e, 0x80, 0x05, 0x3f, 0x80, 0x05, 0x40, 0x80, 0x05, 0x41, 0x80, 0x05,
+    0x42, 0x80, 0x05, 0x43, 0x80, 0x05, 0x44, 0x80, 0x05, 0x45, 0x80, 0x05, 0x46, 0x80, 0x05, 0x47, 0x80, 0x05, 0x48, 0x80, 0x05,
+    0x49, 0x80, 0x05, 0x4a, 0x80, 0x05, 0x4b, 0x80, 0x05, 0x4c, 0x80, 0x05, 0x4d, 0x80, 0x05, 0x4e, 0x80, 0x05, 0x4f, 0x80, 0x05,
+    0x50, 0x80, 0x05, 0x51, 0x80, 0x05, 0x52, 0x80, 0x05, 0x53, 0x80, 0x05, 0x54, 0x80, 0x05, 0x55, 0x80, 0x05, 0x56, 0x80, 0x05,
+    0x57, 0x80, 0x05, 0x58, 0x80, 0x05, 0x59, 0x80, 0x05, 0x5a, 0x80, 0x05, 0x5b, 0x80, 0x05, 0x5c, 0x80, 0x05, 0x5d, 0x80, 0x05,
+    0x5e, 0x80, 0x05, 0x5f, 0x80, 0x05, 0x60, 0x80, 0x05, 0x61, 0x80, 0x05, 0x62, 0x80, 0x05, 0x63, 0x80, 0x18, 0x24, 0x03, 0x16,
+    0x2c, 0x04, 0x13, 0x43, 0x53, 0x41, 0x30, 0x30, 0x30, 0x30, 0x30, 0x53, 0x57, 0x43, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30,
+    0x30, 0x24, 0x05, 0x00, 0x24, 0x06, 0x00, 0x24, 0x07, 0x01, 0x24, 0x08, 0x00, 0x18, 0x31, 0x7e, 0x30, 0x7c, 0x02, 0x01, 0x03,
+    0x80, 0x14, 0x62, 0xfa, 0x82, 0x33, 0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e, 0x1c, 0xfa, 0x14, 0x0a, 0xdd, 0xf5, 0x04, 0xf3, 0x71,
+    0x60, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48,
+    0xce, 0x3d, 0x04, 0x03, 0x02, 0x04, 0x48, 0x30, 0x46, 0x02, 0x21, 0x00, 0x8d, 0xed, 0x3d, 0xdd, 0xbb, 0x6f, 0x3c, 0x6d, 0xca,
+    0xc7, 0xb5, 0x75, 0x14, 0xc5, 0x8e, 0x69, 0x4a, 0xea, 0xd4, 0xc2, 0xc8, 0x2f, 0x9b, 0x46, 0x2b, 0x73, 0xeb, 0x00, 0x3a, 0x60,
+    0x41, 0xf2, 0x02, 0x21, 0x00, 0xbd, 0x95, 0xe7, 0x9e, 0xe3, 0x8c, 0x07, 0x90, 0xd6, 0x9b, 0xaa, 0x45, 0x3b, 0xfc, 0x3c, 0x74,
+    0x96, 0x6c, 0x79, 0x4f, 0x1c, 0x4d, 0xd7, 0x5d, 0x15, 0x03, 0x24, 0xd8, 0xa5, 0xca, 0x82, 0x3d
+};
+#elif CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3
+constexpr const uint8_t kCdForAllExamples[539] = {
+    0x30, 0x82, 0x02, 0x17, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x08, 0x30, 0x82,
+    0x02, 0x04, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30,
+    0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61, 0x04, 0x82, 0x01,
+    0x5d, 0x15, 0x24, 0x00, 0x01, 0x25, 0x01, 0xf3, 0xff, 0x36, 0x02, 0x05, 0x00, 0x80, 0x05, 0x01, 0x80, 0x05, 0x02, 0x80, 0x05,
+    0x03, 0x80, 0x05, 0x04, 0x80, 0x05, 0x05, 0x80, 0x05, 0x06, 0x80, 0x05, 0x07, 0x80, 0x05, 0x08, 0x80, 0x05, 0x09, 0x80, 0x05,
+    0x0a, 0x80, 0x05, 0x0b, 0x80, 0x05, 0x0c, 0x80, 0x05, 0x0d, 0x80, 0x05, 0x0e, 0x80, 0x05, 0x0f, 0x80, 0x05, 0x10, 0x80, 0x05,
+    0x11, 0x80, 0x05, 0x12, 0x80, 0x05, 0x13, 0x80, 0x05, 0x14, 0x80, 0x05, 0x15, 0x80, 0x05, 0x16, 0x80, 0x05, 0x17, 0x80, 0x05,
+    0x18, 0x80, 0x05, 0x19, 0x80, 0x05, 0x1a, 0x80, 0x05, 0x1b, 0x80, 0x05, 0x1c, 0x80, 0x05, 0x1d, 0x80, 0x05, 0x1e, 0x80, 0x05,
+    0x1f, 0x80, 0x05, 0x20, 0x80, 0x05, 0x21, 0x80, 0x05, 0x22, 0x80, 0x05, 0x23, 0x80, 0x05, 0x24, 0x80, 0x05, 0x25, 0x80, 0x05,
+    0x26, 0x80, 0x05, 0x27, 0x80, 0x05, 0x28, 0x80, 0x05, 0x29, 0x80, 0x05, 0x2a, 0x80, 0x05, 0x2b, 0x80, 0x05, 0x2c, 0x80, 0x05,
+    0x2d, 0x80, 0x05, 0x2e, 0x80, 0x05, 0x2f, 0x80, 0x05, 0x30, 0x80, 0x05, 0x31, 0x80, 0x05, 0x32, 0x80, 0x05, 0x33, 0x80, 0x05,
+    0x34, 0x80, 0x05, 0x35, 0x80, 0x05, 0x36, 0x80, 0x05, 0x37, 0x80, 0x05, 0x38, 0x80, 0x05, 0x39, 0x80, 0x05, 0x3a, 0x80, 0x05,
+    0x3b, 0x80, 0x05, 0x3c, 0x80, 0x05, 0x3d, 0x80, 0x05, 0x3e, 0x80, 0x05, 0x3f, 0x80, 0x05, 0x40, 0x80, 0x05, 0x41, 0x80, 0x05,
+    0x42, 0x80, 0x05, 0x43, 0x80, 0x05, 0x44, 0x80, 0x05, 0x45, 0x80, 0x05, 0x46, 0x80, 0x05, 0x47, 0x80, 0x05, 0x48, 0x80, 0x05,
+    0x49, 0x80, 0x05, 0x4a, 0x80, 0x05, 0x4b, 0x80, 0x05, 0x4c, 0x80, 0x05, 0x4d, 0x80, 0x05, 0x4e, 0x80, 0x05, 0x4f, 0x80, 0x05,
+    0x50, 0x80, 0x05, 0x51, 0x80, 0x05, 0x52, 0x80, 0x05, 0x53, 0x80, 0x05, 0x54, 0x80, 0x05, 0x55, 0x80, 0x05, 0x56, 0x80, 0x05,
+    0x57, 0x80, 0x05, 0x58, 0x80, 0x05, 0x59, 0x80, 0x05, 0x5a, 0x80, 0x05, 0x5b, 0x80, 0x05, 0x5c, 0x80, 0x05, 0x5d, 0x80, 0x05,
+    0x5e, 0x80, 0x05, 0x5f, 0x80, 0x05, 0x60, 0x80, 0x05, 0x61, 0x80, 0x05, 0x62, 0x80, 0x05, 0x63, 0x80, 0x18, 0x24, 0x03, 0x16,
+    0x2c, 0x04, 0x13, 0x43, 0x53, 0x41, 0x30, 0x30, 0x30, 0x30, 0x30, 0x53, 0x57, 0x43, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30,
+    0x30, 0x24, 0x05, 0x00, 0x24, 0x06, 0x00, 0x24, 0x07, 0x01, 0x24, 0x08, 0x00, 0x18, 0x31, 0x7c, 0x30, 0x7a, 0x02, 0x01, 0x03,
+    0x80, 0x14, 0x62, 0xfa, 0x82, 0x33, 0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e, 0x1c, 0xfa, 0x14, 0x0a, 0xdd, 0xf5, 0x04, 0xf3, 0x71,
+    0x60, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48,
+    0xce, 0x3d, 0x04, 0x03, 0x02, 0x04, 0x46, 0x30, 0x44, 0x02, 0x20, 0x1e, 0x14, 0xa8, 0xc6, 0x95, 0x1d, 0x50, 0x87, 0x94, 0x2f,
+    0x58, 0x69, 0x38, 0x8a, 0xdc, 0x49, 0x50, 0x40, 0x63, 0x5d, 0xdf, 0xc7, 0x93, 0x8b, 0xf0, 0x8a, 0x49, 0xce, 0x8f, 0xe2, 0xf0,
+    0x28, 0x02, 0x20, 0x50, 0x90, 0x96, 0x20, 0x3f, 0xab, 0xe2, 0x19, 0xf8, 0xec, 0xf0, 0xe6, 0x9b, 0xa7, 0x51, 0x79, 0x9c, 0x02,
+    0x98, 0x96, 0xc7, 0xc9, 0xc8, 0x2d, 0x4b, 0xf5, 0x76, 0xd3, 0x8f, 0xbd, 0x36, 0x5b
+};
+#else  /* Fall back to the VID=0xFFF1 CD */
 constexpr const uint8_t kCdForAllExamples[540] = {
     0x30, 0x82, 0x02, 0x17, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x08, 0x30, 0x82,
     0x02, 0x04, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30,
@@ -74,6 +134,7 @@ constexpr const uint8_t kCdForAllExamples[540] = {
     0xc5, 0x02, 0x20, 0x20, 0xa4, 0x74, 0x28, 0x97, 0xc3, 0x0a, 0xed, 0xa0, 0xa5, 0x6b, 0x36, 0xe1, 0x4e, 0xbb, 0xc8, 0x5b, 0xbd,
     0xb7, 0x44, 0x93, 0xf9, 0x93, 0x58, 0x1e, 0xb0, 0x44, 0x4e, 0xd6, 0xca, 0x94, 0x0b
 };
+#endif // CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
 
 namespace chip {
 namespace Credentials {
diff --git a/src/controller/python/chip/clusters/Attribute.py b/src/controller/python/chip/clusters/Attribute.py
index 5cad75c444a871..1bd60cbf23501d 100644
--- a/src/controller/python/chip/clusters/Attribute.py
+++ b/src/controller/python/chip/clusters/Attribute.py
@@ -939,9 +939,9 @@ def WriteAttributes(future: Future, eventLoop, device, attributes: List[Attribut
     res = builtins.chipStack.Call(
         lambda: handle.pychip_WriteClient_WriteAttributes(
             ctypes.py_object(transaction), device,
-            ctypes.c_uint16(0 if timedRequestTimeoutMs is None else timedRequestTimeoutMs),
-            ctypes.c_uint16(0 if interactionTimeoutMs is None else interactionTimeoutMs),
-            ctypes.c_uint16(0 if busyWaitMs is None else busyWaitMs),
+            ctypes.c_size_t(0 if timedRequestTimeoutMs is None else timedRequestTimeoutMs),
+            ctypes.c_size_t(0 if interactionTimeoutMs is None else interactionTimeoutMs),
+            ctypes.c_size_t(0 if busyWaitMs is None else busyWaitMs),
             ctypes.c_size_t(len(attributes)), *writeargs)
     )
     if not res.is_success:
@@ -969,8 +969,8 @@ def WriteGroupAttributes(groupId: int, devCtrl: c_void_p, attributes: List[Attri
 
     return builtins.chipStack.Call(
         lambda: handle.pychip_WriteClient_WriteGroupAttributes(
-            ctypes.c_uint16(groupId), devCtrl,
-            ctypes.c_uint16(0 if busyWaitMs is None else busyWaitMs),
+            ctypes.c_size_t(groupId), devCtrl,
+            ctypes.c_size_t(0 if busyWaitMs is None else busyWaitMs),
             ctypes.c_size_t(len(attributes)), *writeargs)
     )
 
@@ -1108,6 +1108,18 @@ def Init():
 
         handle.pychip_WriteClient_WriteAttributes.restype = PyChipError
         handle.pychip_WriteClient_WriteGroupAttributes.restype = PyChipError
+
+        # Both WriteAttributes and WriteGroupAttributes are variadic functions. As per ctype documentation
+        # https://docs.python.org/3/library/ctypes.html#calling-varadic-functions, it is critical that we
+        # specify the argtypes attribute for the regular, non-variadic, function arguments for this to work
+        # on ARM64 for Apple Platforms.
+        # TODO We could move away from a variadic function to one where we provide a vector of the
+        # attribute information we want written using a vector. This possibility was not implemented at the
+        # time where simply specified the argtypes, because of time constraints. This solution was quicker
+        # to fix the crash on ARM64 Apple platforms without a refactor.
+        handle.pychip_WriteClient_WriteAttributes.argtypes = [py_object, c_void_p, c_size_t, c_size_t, c_size_t, c_size_t]
+        handle.pychip_WriteClient_WriteGroupAttributes.argtypes = [c_size_t, c_void_p, c_size_t, c_size_t]
+
         setter.Set('pychip_WriteClient_InitCallbacks', None, [
                    _OnWriteResponseCallbackFunct, _OnWriteErrorCallbackFunct, _OnWriteDoneCallbackFunct])
         handle.pychip_ReadClient_Read.restype = PyChipError
diff --git a/src/controller/python/chip/clusters/attribute.cpp b/src/controller/python/chip/clusters/attribute.cpp
index 5e7ffcdc679008..d97faf5cdaaad8 100644
--- a/src/controller/python/chip/clusters/attribute.cpp
+++ b/src/controller/python/chip/clusters/attribute.cpp
@@ -246,10 +246,10 @@ struct __attribute__((packed)) PyReadAttributeParams
 };
 
 // Encodes n attribute write requests, follows 3 * n arguments, in the (AttributeWritePath*=void *, uint8_t*, size_t) order.
-PyChipError pychip_WriteClient_WriteAttributes(void * appContext, DeviceProxy * device, uint16_t timedWriteTimeoutMs,
-                                               uint16_t interactionTimeoutMs, uint16_t busyWaitMs, size_t n, ...);
-PyChipError pychip_WriteClient_WriteGroupAttributes(chip::GroupId groupId, chip::Controller::DeviceCommissioner * devCtrl,
-                                                    uint16_t busyWaitMs, size_t n, ...);
+PyChipError pychip_WriteClient_WriteAttributes(void * appContext, DeviceProxy * device, size_t timedWriteTimeoutMsSizeT,
+                                               size_t interactionTimeoutMsSizeT, size_t busyWaitMsSizeT, size_t n, ...);
+PyChipError pychip_WriteClient_WriteGroupAttributes(size_t groupIdSizeT, chip::Controller::DeviceCommissioner * devCtrl,
+                                                    size_t busyWaitMsSizeT, size_t n, ...);
 PyChipError pychip_ReadClient_ReadAttributes(void * appContext, ReadClient ** pReadClient, ReadClientCallback ** pCallback,
                                              DeviceProxy * device, uint8_t * readParamsBuf, size_t n, size_t total, ...);
 }
@@ -325,11 +325,17 @@ void pychip_ReadClient_InitCallbacks(OnReadAttributeDataCallback onReadAttribute
     gOnReportEndCallback               = onReportEndCallback;
 }
 
-PyChipError pychip_WriteClient_WriteAttributes(void * appContext, DeviceProxy * device, uint16_t timedWriteTimeoutMs,
-                                               uint16_t interactionTimeoutMs, uint16_t busyWaitMs, size_t n, ...)
+PyChipError pychip_WriteClient_WriteAttributes(void * appContext, DeviceProxy * device, size_t timedWriteTimeoutMsSizeT,
+                                               size_t interactionTimeoutMsSizeT, size_t busyWaitMsSizeT, size_t n, ...)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
+    // The FFI from Python to C when calling a variadic function has issues when the regular, non-variadic, function
+    // arguments are unit16_t. As a result we pass these arguments as size_t and cast them to the expected uint16_t.
+    uint16_t timedWriteTimeoutMs  = static_cast<uint16_t>(timedWriteTimeoutMsSizeT);
+    uint16_t interactionTimeoutMs = static_cast<uint16_t>(interactionTimeoutMsSizeT);
+    uint16_t busyWaitMs           = static_cast<uint16_t>(busyWaitMsSizeT);
+
     std::unique_ptr<WriteClientCallback> callback = std::make_unique<WriteClientCallback>(appContext);
     std::unique_ptr<WriteClient> client           = std::make_unique<WriteClient>(
         app::InteractionModelEngine::GetInstance()->GetExchangeManager(), callback->GetChunkedCallback(),
@@ -383,11 +389,17 @@ PyChipError pychip_WriteClient_WriteAttributes(void * appContext, DeviceProxy *
     return ToPyChipError(err);
 }
 
-PyChipError pychip_WriteClient_WriteGroupAttributes(chip::GroupId groupId, chip::Controller::DeviceCommissioner * devCtrl,
-                                                    uint16_t busyWaitMs, size_t n, ...)
+PyChipError pychip_WriteClient_WriteGroupAttributes(size_t groupIdSizeT, chip::Controller::DeviceCommissioner * devCtrl,
+                                                    size_t busyWaitMsSizeT, size_t n, ...)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
+    // The FFI from Python to C when calling a variadic function has issues when the regular, non-variadic, function
+    // arguments are unit16_t (which is the type for chip::GroupId). As a result we pass these arguments as size_t
+    // and cast them to the expected type here.
+    chip::GroupId groupId = static_cast<chip::GroupId>(groupIdSizeT);
+    uint16_t busyWaitMs   = static_cast<uint16_t>(busyWaitMsSizeT);
+
     chip::Messaging::ExchangeManager * exchangeManager = chip::app::InteractionModelEngine::GetInstance()->GetExchangeManager();
     VerifyOrReturnError(exchangeManager != nullptr, ToPyChipError(CHIP_ERROR_INCORRECT_STATE));
 
diff --git a/src/controller/tests/data_model/TestRead.cpp b/src/controller/tests/data_model/TestRead.cpp
index 1bfbac35ef93b4..c9fb756200e273 100644
--- a/src/controller/tests/data_model/TestRead.cpp
+++ b/src/controller/tests/data_model/TestRead.cpp
@@ -317,6 +317,10 @@ class TestReadInteraction : public app::ReadHandler::ApplicationCallback
     // of reads in parallel and wait for them all to succeed.
     static void SubscribeThenReadHelper(nlTestSuite * apSuite, TestContext & aCtx, size_t aSubscribeCount, size_t aReadCount);
 
+    // Compute the amount of time it would take a subscription with a given
+    // max-interval to time out.
+    static System::Clock::Timeout ComputeSubscriptionTimeout(System::Clock::Seconds16 aMaxInterval);
+
     bool mEmitSubscriptionError      = false;
     int32_t mNumActiveSubscriptions  = 0;
     bool mAlterSubscriptionIntervals = false;
@@ -1684,7 +1688,9 @@ void TestReadInteraction::TestResubscribeAttributeTimeout(nlTestSuite * apSuite,
         attributePathParams[0].mClusterId              = app::Clusters::UnitTesting::Id;
         attributePathParams[0].mAttributeId            = app::Clusters::UnitTesting::Attributes::Boolean::Id;
 
-        readPrepareParams.mMaxIntervalCeilingSeconds = 1;
+        constexpr uint16_t maxIntervalCeilingSeconds = 1;
+
+        readPrepareParams.mMaxIntervalCeilingSeconds = maxIntervalCeilingSeconds;
 
         auto err = readClient.SendAutoResubscribeRequest(std::move(readPrepareParams));
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -1701,10 +1707,9 @@ void TestReadInteraction::TestResubscribeAttributeTimeout(nlTestSuite * apSuite,
         //
         // Disable packet transmission, and drive IO till we have reported a re-subscription attempt.
         //
-        // 1.5s should cover the liveness timeout in the client of 1s max interval + 50ms ACK timeout.
         //
         ctx.GetLoopback().mNumMessagesToDrop = chip::Test::LoopbackTransport::kUnlimitedMessageCount;
-        ctx.GetIOContext().DriveIOUntil(System::Clock::Milliseconds32(1500),
+        ctx.GetIOContext().DriveIOUntil(ComputeSubscriptionTimeout(System::Clock::Seconds16(maxIntervalCeilingSeconds)),
                                         [&]() { return callback.mOnResubscriptionsAttempted > 0; });
 
         NL_TEST_ASSERT(apSuite, callback.mOnResubscriptionsAttempted == 1);
@@ -1763,7 +1768,8 @@ void TestReadInteraction::TestSubscribeAttributeTimeout(nlTestSuite * apSuite, v
         //
         // Request a max interval that's very small to reduce time to discovering a liveness failure.
         //
-        readPrepareParams.mMaxIntervalCeilingSeconds = 1;
+        constexpr uint16_t maxIntervalCeilingSeconds = 1;
+        readPrepareParams.mMaxIntervalCeilingSeconds = maxIntervalCeilingSeconds;
 
         auto err = readClient.SendRequest(readPrepareParams);
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -1782,11 +1788,11 @@ void TestReadInteraction::TestSubscribeAttributeTimeout(nlTestSuite * apSuite, v
 
         //
         // Drive IO until we get an error on the subscription, which should be caused
-        // by the liveness timer firing within ~1s of the establishment of the subscription.
+        // by the liveness timer firing once we hit our max-interval plus
+        // retransmit timeouts.
         //
-        // 1.5s should cover the liveness timeout in the client of 1s max interval + 50ms ACK timeout.
-        //
-        ctx.GetIOContext().DriveIOUntil(System::Clock::Milliseconds32(1500), [&]() { return callback.mOnError >= 1; });
+        ctx.GetIOContext().DriveIOUntil(ComputeSubscriptionTimeout(System::Clock::Seconds16(maxIntervalCeilingSeconds)),
+                                        [&]() { return callback.mOnError >= 1; });
 
         NL_TEST_ASSERT(apSuite, callback.mOnError == 1);
         NL_TEST_ASSERT(apSuite, callback.mLastError == CHIP_ERROR_TIMEOUT);
@@ -4617,6 +4623,18 @@ void TestReadInteraction::TestReadHandler_KeepSubscriptionTest(nlTestSuite * apS
     ctx.DrainAndServiceIO();
 }
 
+System::Clock::Timeout TestReadInteraction::ComputeSubscriptionTimeout(System::Clock::Seconds16 aMaxInterval)
+{
+    // Add 50ms of slack to our max interval to make sure we hit the
+    // subscription liveness timer.
+    const auto & ourMrpConfig = GetDefaultMRPConfig();
+    auto publisherTransmissionTimeout =
+        GetRetransmissionTimeout(ourMrpConfig.mActiveRetransTimeout, ourMrpConfig.mIdleRetransTimeout,
+                                 System::SystemClock().GetMonotonicTimestamp(), Transport::kMinActiveTime);
+
+    return publisherTransmissionTimeout + aMaxInterval + System::Clock::Milliseconds32(50);
+}
+
 // clang-format off
 const nlTest sTests[] =
 {
diff --git a/src/credentials/examples/DeviceAttestationCredsExample.cpp b/src/credentials/examples/DeviceAttestationCredsExample.cpp
index bd09e11df67623..f7a80162e2aaaa 100644
--- a/src/credentials/examples/DeviceAttestationCredsExample.cpp
+++ b/src/credentials/examples/DeviceAttestationCredsExample.cpp
@@ -21,6 +21,7 @@
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/Span.h>
+#include <platform/CHIPDeviceConfig.h>
 
 // TODO: Remove once the Attestation Credentials storage mechanism is updated.
 
@@ -63,7 +64,7 @@ CHIP_ERROR ExampleDACProvider::GetProductAttestationIntermediateCert(MutableByte
 CHIP_ERROR ExampleDACProvider::GetCertificationDeclaration(MutableByteSpan & out_cd_buffer)
 {
     //-> format_version = 1
-    //-> vendor_id = 0xFFF1
+    //-> vendor_id = 0xFFF1/0xFFF2/0xFFF3
     //-> product_id_array = [ 0x8000, 0x8001, 0x8002, 0x8003, 0x8004, 0x8005, 0x8006, 0x8007, 0x8008, 0x8009, 0x800A, 0x800B,
     // 0x800C, 0x800D, 0x800E, 0x800F, 0x8010, 0x8011, 0x8012, 0x8013, 0x8014, 0x8015, 0x8016, 0x8017, 0x8018, 0x8019, 0x801A,
     // 0x801B, 0x801C, 0x801D, 0x801E, 0x801F, 0x8020, 0x8021, 0x8022, 0x8023, 0x8024, 0x8025, 0x8026, 0x8027, 0x8028, 0x8029,
@@ -79,6 +80,68 @@ CHIP_ERROR ExampleDACProvider::GetCertificationDeclaration(MutableByteSpan & out
     //-> certification_type = 0
     //-> dac_origin_vendor_id is not present
     //-> dac_origin_product_id is not present
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2
+    const uint8_t kCdForAllExamples[541] = {
+        0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30,
+        0x82, 0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
+        0x01, 0x30, 0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61,
+        0x04, 0x82, 0x01, 0x5d, 0x15, 0x24, 0x00, 0x01, 0x25, 0x01, 0xf2, 0xff, 0x36, 0x02, 0x05, 0x00, 0x80, 0x05, 0x01, 0x80,
+        0x05, 0x02, 0x80, 0x05, 0x03, 0x80, 0x05, 0x04, 0x80, 0x05, 0x05, 0x80, 0x05, 0x06, 0x80, 0x05, 0x07, 0x80, 0x05, 0x08,
+        0x80, 0x05, 0x09, 0x80, 0x05, 0x0a, 0x80, 0x05, 0x0b, 0x80, 0x05, 0x0c, 0x80, 0x05, 0x0d, 0x80, 0x05, 0x0e, 0x80, 0x05,
+        0x0f, 0x80, 0x05, 0x10, 0x80, 0x05, 0x11, 0x80, 0x05, 0x12, 0x80, 0x05, 0x13, 0x80, 0x05, 0x14, 0x80, 0x05, 0x15, 0x80,
+        0x05, 0x16, 0x80, 0x05, 0x17, 0x80, 0x05, 0x18, 0x80, 0x05, 0x19, 0x80, 0x05, 0x1a, 0x80, 0x05, 0x1b, 0x80, 0x05, 0x1c,
+        0x80, 0x05, 0x1d, 0x80, 0x05, 0x1e, 0x80, 0x05, 0x1f, 0x80, 0x05, 0x20, 0x80, 0x05, 0x21, 0x80, 0x05, 0x22, 0x80, 0x05,
+        0x23, 0x80, 0x05, 0x24, 0x80, 0x05, 0x25, 0x80, 0x05, 0x26, 0x80, 0x05, 0x27, 0x80, 0x05, 0x28, 0x80, 0x05, 0x29, 0x80,
+        0x05, 0x2a, 0x80, 0x05, 0x2b, 0x80, 0x05, 0x2c, 0x80, 0x05, 0x2d, 0x80, 0x05, 0x2e, 0x80, 0x05, 0x2f, 0x80, 0x05, 0x30,
+        0x80, 0x05, 0x31, 0x80, 0x05, 0x32, 0x80, 0x05, 0x33, 0x80, 0x05, 0x34, 0x80, 0x05, 0x35, 0x80, 0x05, 0x36, 0x80, 0x05,
+        0x37, 0x80, 0x05, 0x38, 0x80, 0x05, 0x39, 0x80, 0x05, 0x3a, 0x80, 0x05, 0x3b, 0x80, 0x05, 0x3c, 0x80, 0x05, 0x3d, 0x80,
+        0x05, 0x3e, 0x80, 0x05, 0x3f, 0x80, 0x05, 0x40, 0x80, 0x05, 0x41, 0x80, 0x05, 0x42, 0x80, 0x05, 0x43, 0x80, 0x05, 0x44,
+        0x80, 0x05, 0x45, 0x80, 0x05, 0x46, 0x80, 0x05, 0x47, 0x80, 0x05, 0x48, 0x80, 0x05, 0x49, 0x80, 0x05, 0x4a, 0x80, 0x05,
+        0x4b, 0x80, 0x05, 0x4c, 0x80, 0x05, 0x4d, 0x80, 0x05, 0x4e, 0x80, 0x05, 0x4f, 0x80, 0x05, 0x50, 0x80, 0x05, 0x51, 0x80,
+        0x05, 0x52, 0x80, 0x05, 0x53, 0x80, 0x05, 0x54, 0x80, 0x05, 0x55, 0x80, 0x05, 0x56, 0x80, 0x05, 0x57, 0x80, 0x05, 0x58,
+        0x80, 0x05, 0x59, 0x80, 0x05, 0x5a, 0x80, 0x05, 0x5b, 0x80, 0x05, 0x5c, 0x80, 0x05, 0x5d, 0x80, 0x05, 0x5e, 0x80, 0x05,
+        0x5f, 0x80, 0x05, 0x60, 0x80, 0x05, 0x61, 0x80, 0x05, 0x62, 0x80, 0x05, 0x63, 0x80, 0x18, 0x24, 0x03, 0x16, 0x2c, 0x04,
+        0x13, 0x43, 0x53, 0x41, 0x30, 0x30, 0x30, 0x30, 0x30, 0x53, 0x57, 0x43, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30,
+        0x24, 0x05, 0x00, 0x24, 0x06, 0x00, 0x24, 0x07, 0x01, 0x24, 0x08, 0x00, 0x18, 0x31, 0x7e, 0x30, 0x7c, 0x02, 0x01, 0x03,
+        0x80, 0x14, 0x62, 0xfa, 0x82, 0x33, 0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e, 0x1c, 0xfa, 0x14, 0x0a, 0xdd, 0xf5, 0x04, 0xf3,
+        0x71, 0x60, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30, 0x0a, 0x06, 0x08, 0x2a,
+        0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x04, 0x48, 0x30, 0x46, 0x02, 0x21, 0x00, 0x8d, 0xed, 0x3d, 0xdd, 0xbb, 0x6f,
+        0x3c, 0x6d, 0xca, 0xc7, 0xb5, 0x75, 0x14, 0xc5, 0x8e, 0x69, 0x4a, 0xea, 0xd4, 0xc2, 0xc8, 0x2f, 0x9b, 0x46, 0x2b, 0x73,
+        0xeb, 0x00, 0x3a, 0x60, 0x41, 0xf2, 0x02, 0x21, 0x00, 0xbd, 0x95, 0xe7, 0x9e, 0xe3, 0x8c, 0x07, 0x90, 0xd6, 0x9b, 0xaa,
+        0x45, 0x3b, 0xfc, 0x3c, 0x74, 0x96, 0x6c, 0x79, 0x4f, 0x1c, 0x4d, 0xd7, 0x5d, 0x15, 0x03, 0x24, 0xd8, 0xa5, 0xca, 0x82,
+        0x3d
+    };
+#elif CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3
+    const uint8_t kCdForAllExamples[539] = {
+        0x30, 0x82, 0x02, 0x17, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x08, 0x30,
+        0x82, 0x02, 0x04, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
+        0x01, 0x30, 0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61,
+        0x04, 0x82, 0x01, 0x5d, 0x15, 0x24, 0x00, 0x01, 0x25, 0x01, 0xf3, 0xff, 0x36, 0x02, 0x05, 0x00, 0x80, 0x05, 0x01, 0x80,
+        0x05, 0x02, 0x80, 0x05, 0x03, 0x80, 0x05, 0x04, 0x80, 0x05, 0x05, 0x80, 0x05, 0x06, 0x80, 0x05, 0x07, 0x80, 0x05, 0x08,
+        0x80, 0x05, 0x09, 0x80, 0x05, 0x0a, 0x80, 0x05, 0x0b, 0x80, 0x05, 0x0c, 0x80, 0x05, 0x0d, 0x80, 0x05, 0x0e, 0x80, 0x05,
+        0x0f, 0x80, 0x05, 0x10, 0x80, 0x05, 0x11, 0x80, 0x05, 0x12, 0x80, 0x05, 0x13, 0x80, 0x05, 0x14, 0x80, 0x05, 0x15, 0x80,
+        0x05, 0x16, 0x80, 0x05, 0x17, 0x80, 0x05, 0x18, 0x80, 0x05, 0x19, 0x80, 0x05, 0x1a, 0x80, 0x05, 0x1b, 0x80, 0x05, 0x1c,
+        0x80, 0x05, 0x1d, 0x80, 0x05, 0x1e, 0x80, 0x05, 0x1f, 0x80, 0x05, 0x20, 0x80, 0x05, 0x21, 0x80, 0x05, 0x22, 0x80, 0x05,
+        0x23, 0x80, 0x05, 0x24, 0x80, 0x05, 0x25, 0x80, 0x05, 0x26, 0x80, 0x05, 0x27, 0x80, 0x05, 0x28, 0x80, 0x05, 0x29, 0x80,
+        0x05, 0x2a, 0x80, 0x05, 0x2b, 0x80, 0x05, 0x2c, 0x80, 0x05, 0x2d, 0x80, 0x05, 0x2e, 0x80, 0x05, 0x2f, 0x80, 0x05, 0x30,
+        0x80, 0x05, 0x31, 0x80, 0x05, 0x32, 0x80, 0x05, 0x33, 0x80, 0x05, 0x34, 0x80, 0x05, 0x35, 0x80, 0x05, 0x36, 0x80, 0x05,
+        0x37, 0x80, 0x05, 0x38, 0x80, 0x05, 0x39, 0x80, 0x05, 0x3a, 0x80, 0x05, 0x3b, 0x80, 0x05, 0x3c, 0x80, 0x05, 0x3d, 0x80,
+        0x05, 0x3e, 0x80, 0x05, 0x3f, 0x80, 0x05, 0x40, 0x80, 0x05, 0x41, 0x80, 0x05, 0x42, 0x80, 0x05, 0x43, 0x80, 0x05, 0x44,
+        0x80, 0x05, 0x45, 0x80, 0x05, 0x46, 0x80, 0x05, 0x47, 0x80, 0x05, 0x48, 0x80, 0x05, 0x49, 0x80, 0x05, 0x4a, 0x80, 0x05,
+        0x4b, 0x80, 0x05, 0x4c, 0x80, 0x05, 0x4d, 0x80, 0x05, 0x4e, 0x80, 0x05, 0x4f, 0x80, 0x05, 0x50, 0x80, 0x05, 0x51, 0x80,
+        0x05, 0x52, 0x80, 0x05, 0x53, 0x80, 0x05, 0x54, 0x80, 0x05, 0x55, 0x80, 0x05, 0x56, 0x80, 0x05, 0x57, 0x80, 0x05, 0x58,
+        0x80, 0x05, 0x59, 0x80, 0x05, 0x5a, 0x80, 0x05, 0x5b, 0x80, 0x05, 0x5c, 0x80, 0x05, 0x5d, 0x80, 0x05, 0x5e, 0x80, 0x05,
+        0x5f, 0x80, 0x05, 0x60, 0x80, 0x05, 0x61, 0x80, 0x05, 0x62, 0x80, 0x05, 0x63, 0x80, 0x18, 0x24, 0x03, 0x16, 0x2c, 0x04,
+        0x13, 0x43, 0x53, 0x41, 0x30, 0x30, 0x30, 0x30, 0x30, 0x53, 0x57, 0x43, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30,
+        0x24, 0x05, 0x00, 0x24, 0x06, 0x00, 0x24, 0x07, 0x01, 0x24, 0x08, 0x00, 0x18, 0x31, 0x7c, 0x30, 0x7a, 0x02, 0x01, 0x03,
+        0x80, 0x14, 0x62, 0xfa, 0x82, 0x33, 0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e, 0x1c, 0xfa, 0x14, 0x0a, 0xdd, 0xf5, 0x04, 0xf3,
+        0x71, 0x60, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30, 0x0a, 0x06, 0x08, 0x2a,
+        0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x04, 0x46, 0x30, 0x44, 0x02, 0x20, 0x1e, 0x14, 0xa8, 0xc6, 0x95, 0x1d, 0x50,
+        0x87, 0x94, 0x2f, 0x58, 0x69, 0x38, 0x8a, 0xdc, 0x49, 0x50, 0x40, 0x63, 0x5d, 0xdf, 0xc7, 0x93, 0x8b, 0xf0, 0x8a, 0x49,
+        0xce, 0x8f, 0xe2, 0xf0, 0x28, 0x02, 0x20, 0x50, 0x90, 0x96, 0x20, 0x3f, 0xab, 0xe2, 0x19, 0xf8, 0xec, 0xf0, 0xe6, 0x9b,
+        0xa7, 0x51, 0x79, 0x9c, 0x02, 0x98, 0x96, 0xc7, 0xc9, 0xc8, 0x2d, 0x4b, 0xf5, 0x76, 0xd3, 0x8f, 0xbd, 0x36, 0x5b
+    };
+#else  /* Fall back to the VID=0xFFF1 CD */
     const uint8_t kCdForAllExamples[539] = {
         0x30, 0x82, 0x02, 0x17, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x08, 0x30,
         0x82, 0x02, 0x04, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
@@ -108,6 +171,8 @@ CHIP_ERROR ExampleDACProvider::GetCertificationDeclaration(MutableByteSpan & out
         0xf7, 0xa3, 0x6a, 0x7d, 0xc5, 0x02, 0x20, 0x20, 0xa4, 0x74, 0x28, 0x97, 0xc3, 0x0a, 0xed, 0xa0, 0xa5, 0x6b, 0x36, 0xe1,
         0x4e, 0xbb, 0xc8, 0x5b, 0xbd, 0xb7, 0x44, 0x93, 0xf9, 0x93, 0x58, 0x1e, 0xb0, 0x44, 0x4e, 0xd6, 0xca, 0x94, 0x0b
     };
+#endif // CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
+
     return CopySpanToMutableSpan(ByteSpan{ kCdForAllExamples }, out_cd_buffer);
 }
 
diff --git a/src/credentials/examples/ExampleDACs.cpp b/src/credentials/examples/ExampleDACs.cpp
index 027a619bbebe36..5f5cf20ac9aad6 100644
--- a/src/credentials/examples/ExampleDACs.cpp
+++ b/src/credentials/examples/ExampleDACs.cpp
@@ -14,6 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
+/**
+ * NOTE: This file is generated by src/tools/chip-cert/dacs.py.
+ */
 #include "ExampleDACs.h"
 
 #include <cstdint>
@@ -24,7 +28,7 @@
 namespace chip {
 namespace DevelopmentCerts {
 
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8000
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8000
 const uint8_t kDevelopmentDAC_Cert_FFF1_8000[493] = {
     0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x23, 0x8a, 0x64, 0x7b, 0xbc, 0x4c,
     0x30, 0xdd, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -65,7 +69,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8000);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8000);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8000);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8001
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8001
 const uint8_t kDevelopmentDAC_Cert_FFF1_8001[491] = {
     0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x69, 0xcd, 0xf1, 0x0d, 0xe9, 0xe5,
     0x4e, 0xd1, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -106,7 +110,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8001);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8001);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8001);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8002
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8002
 const uint8_t kDevelopmentDAC_Cert_FFF1_8002[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x52, 0x72, 0x4d, 0x21, 0xe2, 0xc1,
     0x74, 0xaf, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -147,7 +151,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8002);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8002);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8002);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8003
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8003
 const uint8_t kDevelopmentDAC_Cert_FFF1_8003[493] = {
     0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x4a, 0x22, 0x27, 0xbc, 0xdb, 0xd4,
     0x33, 0xd2, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -188,7 +192,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8003);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8003);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8003);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8004
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8004
 const uint8_t kDevelopmentDAC_Cert_FFF1_8004[493] = {
     0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x1e, 0x06, 0x7f, 0x3b, 0xfe, 0xcd,
     0xd8, 0x13, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -229,7 +233,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8004);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8004);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8004);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8005
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8005
 const uint8_t kDevelopmentDAC_Cert_FFF1_8005[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x6f, 0xdc, 0xb6, 0xed, 0x06, 0xf3,
     0x58, 0xf9, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -270,7 +274,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8005);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8005);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8005);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8006
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8006
 const uint8_t kDevelopmentDAC_Cert_FFF1_8006[491] = {
     0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8d, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x07, 0x21, 0xf6, 0x6d, 0xf5, 0x1d, 0x72,
     0x58, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03,
@@ -311,7 +315,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8006);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8006);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8006);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8007
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8007
 const uint8_t kDevelopmentDAC_Cert_FFF1_8007[491] = {
     0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x58, 0x48, 0xb6, 0x4f, 0xbd, 0x0c,
     0x9a, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -352,7 +356,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8007);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8007);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8007);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8008
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8008
 const uint8_t kDevelopmentDAC_Cert_FFF1_8008[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x75, 0xd8, 0x07, 0xdc, 0x88, 0x91,
     0x88, 0x2e, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -393,7 +397,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8008);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8008);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8008);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8009
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8009
 const uint8_t kDevelopmentDAC_Cert_FFF1_8009[491] = {
     0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x2f, 0x19, 0xf4, 0x97, 0x8d, 0x94,
     0xdf, 0xcf, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -434,7 +438,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8009);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8009);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8009);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800A
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800A
 const uint8_t kDevelopmentDAC_Cert_FFF1_800A[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x3d, 0xc4, 0xfb, 0x5c, 0x8e, 0x4d,
     0x26, 0x46, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -475,7 +479,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_800A);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_800A);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_800A);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800B
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800B
 const uint8_t kDevelopmentDAC_Cert_FFF1_800B[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x2b, 0xd5, 0x3d, 0xfc, 0x89, 0x6b,
     0x91, 0x9f, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -516,7 +520,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_800B);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_800B);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_800B);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800C
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800C
 const uint8_t kDevelopmentDAC_Cert_FFF1_800C[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x58, 0x9e, 0x58, 0x6f, 0xb4, 0xd1,
     0xd3, 0x50, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -557,7 +561,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_800C);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_800C);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_800C);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800D
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800D
 const uint8_t kDevelopmentDAC_Cert_FFF1_800D[491] = {
     0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x24, 0x01, 0x4c, 0xae, 0x54, 0xae,
     0xbf, 0xa3, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -598,7 +602,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_800D);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_800D);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_800D);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800E
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800E
 const uint8_t kDevelopmentDAC_Cert_FFF1_800E[491] = {
     0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x63, 0x79, 0x50, 0x90, 0x1e, 0xf6,
     0x99, 0x72, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -639,7 +643,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_800E);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_800E);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_800E);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800F
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800F
 const uint8_t kDevelopmentDAC_Cert_FFF1_800F[491] = {
     0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x43, 0x0c, 0xcf, 0x7b, 0x27, 0x46,
     0x74, 0x42, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -680,7 +684,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_800F);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_800F);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_800F);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8010
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8010
 const uint8_t kDevelopmentDAC_Cert_FFF1_8010[491] = {
     0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x46, 0x7f, 0x57, 0x62, 0xc8, 0xdc,
     0x90, 0xd5, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -721,7 +725,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8010);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8010);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8010);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8011
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8011
 const uint8_t kDevelopmentDAC_Cert_FFF1_8011[493] = {
     0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x0e, 0x5c, 0x88, 0xcc, 0x15, 0xe3,
     0xda, 0xe5, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -762,7 +766,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8011);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8011);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8011);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8012
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8012
 const uint8_t kDevelopmentDAC_Cert_FFF1_8012[493] = {
     0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x41, 0x2d, 0xc7, 0x93, 0xe5, 0x15,
     0x40, 0x9c, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -803,7 +807,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8012);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8012);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8012);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8013
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8013
 const uint8_t kDevelopmentDAC_Cert_FFF1_8013[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x7b, 0x4d, 0x47, 0x2e, 0x05, 0x9a,
     0xc7, 0x0b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -844,7 +848,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8013);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8013);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8013);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8014
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8014
 const uint8_t kDevelopmentDAC_Cert_FFF1_8014[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x69, 0x90, 0x05, 0xe0, 0xed, 0xa8,
     0x50, 0x47, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -885,7 +889,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8014);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8014);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8014);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8015
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8015
 const uint8_t kDevelopmentDAC_Cert_FFF1_8015[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x62, 0x8f, 0xa9, 0x12, 0xcd, 0x16,
     0x5d, 0x7b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -926,7 +930,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8015);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8015);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8015);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8016
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8016
 const uint8_t kDevelopmentDAC_Cert_FFF1_8016[490] = {
     0x30, 0x82, 0x01, 0xe6, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x35, 0x49, 0xfd, 0x40, 0x21, 0x03,
     0x13, 0x07, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -967,7 +971,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8016);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8016);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8016);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8017
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8017
 const uint8_t kDevelopmentDAC_Cert_FFF1_8017[493] = {
     0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x1b, 0x7f, 0x4d, 0x97, 0x13, 0xb2,
     0x91, 0x05, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -1008,7 +1012,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8017);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8017);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8017);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8018
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8018
 const uint8_t kDevelopmentDAC_Cert_FFF1_8018[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x33, 0x5c, 0xff, 0x1c, 0x68, 0x11,
     0xff, 0xdf, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -1049,7 +1053,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8018);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8018);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8018);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8019
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8019
 const uint8_t kDevelopmentDAC_Cert_FFF1_8019[493] = {
     0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x33, 0x73, 0x4c, 0xce, 0xe6, 0x97,
     0x6b, 0xcb, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -1090,7 +1094,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_8019);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_8019);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_8019);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801A
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801A
 const uint8_t kDevelopmentDAC_Cert_FFF1_801A[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x55, 0x58, 0xd6, 0xd2, 0x2d, 0x4b,
     0x3b, 0xc1, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -1131,7 +1135,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_801A);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_801A);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_801A);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801B
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801B
 const uint8_t kDevelopmentDAC_Cert_FFF1_801B[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x61, 0x9a, 0x89, 0x0d, 0x6c, 0x3a,
     0x6c, 0xec, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -1172,7 +1176,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_801B);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_801B);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_801B);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801C
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801C
 const uint8_t kDevelopmentDAC_Cert_FFF1_801C[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x10, 0x90, 0xb9, 0x25, 0xda, 0x2b,
     0x53, 0x65, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -1213,7 +1217,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_801C);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_801C);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_801C);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801D
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801D
 const uint8_t kDevelopmentDAC_Cert_FFF1_801D[493] = {
     0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x6f, 0x2a, 0x42, 0xc2, 0x9d, 0x3b,
     0x67, 0x7f, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -1254,7 +1258,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_801D);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_801D);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_801D);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801E
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801E
 const uint8_t kDevelopmentDAC_Cert_FFF1_801E[493] = {
     0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x48, 0x5c, 0x92, 0xd5, 0xaf, 0x31,
     0xc1, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -1295,7 +1299,7 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_801E);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_801E);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_801E);
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801F
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801F
 const uint8_t kDevelopmentDAC_Cert_FFF1_801F[492] = {
     0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x74, 0xef, 0xa7, 0x97, 0x5e, 0x10,
     0x91, 0x70, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
@@ -1336,5 +1340,2619 @@ ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF1_801F);
 ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF1_801F);
 ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF1_801F);
 #endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8000
+const uint8_t kDevelopmentDAC_Cert_FFF2_8000[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x60, 0x7d, 0xdc, 0xfb, 0x54, 0xda,
+    0x8c, 0x5d, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x30, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x30, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x7b, 0x39, 0xdb, 0xaa, 0x39, 0x3e, 0xd7, 0x15,
+    0x5f, 0x4e, 0x3b, 0x31, 0x55, 0xcf, 0xd8, 0x51, 0xf5, 0xd6, 0x80, 0xc6, 0x3b, 0x2c, 0xe2, 0xef, 0x3d, 0x5b, 0x81, 0x93, 0xf2,
+    0x96, 0x3e, 0x5d, 0x07, 0x90, 0x7d, 0x6f, 0xb6, 0x52, 0xf1, 0xb4, 0xe5, 0x06, 0xdb, 0xc2, 0x7f, 0x30, 0xbe, 0x7c, 0xf2, 0x9d,
+    0xef, 0xa2, 0x95, 0x36, 0xf6, 0x65, 0xa6, 0xde, 0x56, 0x2d, 0xd5, 0x9a, 0xc6, 0x6b, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xee, 0xae, 0x14, 0xfe,
+    0x0f, 0xad, 0x54, 0xd7, 0x84, 0xec, 0xbe, 0x06, 0x02, 0x02, 0x2c, 0xf7, 0xcf, 0x4b, 0xdc, 0xff, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x00, 0xee, 0xc1, 0xf8, 0xc6, 0x0a, 0x17, 0x2d, 0x57, 0x27, 0x01, 0x98, 0x98, 0xc7, 0xbc, 0xd0,
+    0xde, 0xa1, 0x2c, 0x76, 0xd3, 0x78, 0x6f, 0x88, 0xc7, 0x09, 0x3b, 0x97, 0xe6, 0xd9, 0x98, 0x95, 0x02, 0x21, 0x00, 0xe2, 0x0e,
+    0x99, 0x2c, 0x7e, 0xe0, 0x19, 0x5c, 0xe1, 0x91, 0xae, 0xad, 0x31, 0x6f, 0x40, 0x71, 0x44, 0x23, 0x33, 0xff, 0x83, 0xfc, 0x2e,
+    0xfc, 0xee, 0x3b, 0x57, 0xd9, 0x23, 0x95, 0x2e, 0x66,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8000[65] = {
+    0x04, 0x7b, 0x39, 0xdb, 0xaa, 0x39, 0x3e, 0xd7, 0x15, 0x5f, 0x4e, 0x3b, 0x31, 0x55, 0xcf, 0xd8, 0x51,
+    0xf5, 0xd6, 0x80, 0xc6, 0x3b, 0x2c, 0xe2, 0xef, 0x3d, 0x5b, 0x81, 0x93, 0xf2, 0x96, 0x3e, 0x5d, 0x07,
+    0x90, 0x7d, 0x6f, 0xb6, 0x52, 0xf1, 0xb4, 0xe5, 0x06, 0xdb, 0xc2, 0x7f, 0x30, 0xbe, 0x7c, 0xf2, 0x9d,
+    0xef, 0xa2, 0x95, 0x36, 0xf6, 0x65, 0xa6, 0xde, 0x56, 0x2d, 0xd5, 0x9a, 0xc6, 0x6b,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8000[32] = {
+    0xd5, 0xd6, 0xa3, 0x65, 0x14, 0x36, 0xb1, 0x4c, 0xa3, 0xaf, 0x5f, 0xd0, 0xff, 0x06, 0x16, 0x15,
+    0xce, 0xeb, 0x8a, 0x85, 0x0c, 0x7b, 0x21, 0xb5, 0x94, 0xec, 0x90, 0x31, 0x1b, 0x4d, 0xb8, 0x15,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8000);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8000);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8000);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8001
+const uint8_t kDevelopmentDAC_Cert_FFF2_8001[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x6c, 0xfc, 0xe4, 0x5d, 0xaa, 0x6b,
+    0x0b, 0xb3, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x31, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x31, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x4f, 0x80, 0x82, 0x8d, 0x5a, 0xc5, 0x22, 0xa9,
+    0x48, 0x04, 0x0d, 0x2e, 0xaf, 0xf7, 0x86, 0xbc, 0xea, 0x76, 0x66, 0x1a, 0x6a, 0xbe, 0x6c, 0x74, 0xf6, 0xaa, 0x80, 0x49, 0x07,
+    0x10, 0xa7, 0xbf, 0xd9, 0x6b, 0xec, 0xa9, 0x18, 0x5f, 0xc4, 0x16, 0x0f, 0x2a, 0x55, 0x11, 0x9b, 0x3c, 0x8e, 0x53, 0xe0, 0xa7,
+    0x66, 0x6e, 0xf1, 0x2b, 0xc5, 0x5c, 0xf7, 0x2f, 0x44, 0xb6, 0xb0, 0x7c, 0x34, 0x45, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x8d, 0x58, 0x9e, 0x2d,
+    0x4d, 0xed, 0xb2, 0x42, 0x95, 0x7f, 0x9d, 0xce, 0x5c, 0x3a, 0x0d, 0xf9, 0x0b, 0x75, 0x1d, 0xcd, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x77, 0x5c, 0x5d, 0x58, 0xf0, 0x3d, 0xb9, 0xa2, 0xa2, 0xcd, 0xab, 0x47, 0xda, 0x4f, 0x21, 0x15,
+    0xc8, 0x8f, 0xdc, 0xc1, 0xb5, 0x18, 0x06, 0x6f, 0xa1, 0x11, 0xa9, 0x4e, 0x84, 0x77, 0xc8, 0xa5, 0x02, 0x21, 0x00, 0xc8, 0xee,
+    0xd8, 0x81, 0x73, 0x38, 0xe0, 0x51, 0x59, 0x5f, 0x23, 0x39, 0x08, 0xdb, 0xf1, 0x8d, 0x74, 0x6b, 0xd0, 0x14, 0xda, 0x34, 0xa7,
+    0x03, 0x74, 0xff, 0xbd, 0xf9, 0x0c, 0x1e, 0xc2, 0x5b,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8001[65] = {
+    0x04, 0x4f, 0x80, 0x82, 0x8d, 0x5a, 0xc5, 0x22, 0xa9, 0x48, 0x04, 0x0d, 0x2e, 0xaf, 0xf7, 0x86, 0xbc,
+    0xea, 0x76, 0x66, 0x1a, 0x6a, 0xbe, 0x6c, 0x74, 0xf6, 0xaa, 0x80, 0x49, 0x07, 0x10, 0xa7, 0xbf, 0xd9,
+    0x6b, 0xec, 0xa9, 0x18, 0x5f, 0xc4, 0x16, 0x0f, 0x2a, 0x55, 0x11, 0x9b, 0x3c, 0x8e, 0x53, 0xe0, 0xa7,
+    0x66, 0x6e, 0xf1, 0x2b, 0xc5, 0x5c, 0xf7, 0x2f, 0x44, 0xb6, 0xb0, 0x7c, 0x34, 0x45,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8001[32] = {
+    0x93, 0x65, 0x4d, 0x8b, 0x92, 0xd9, 0x12, 0x49, 0x51, 0x6a, 0xb3, 0xd7, 0x38, 0x0c, 0xf6, 0x33,
+    0xc2, 0xc8, 0x7e, 0x0c, 0xdf, 0xa9, 0x45, 0x9a, 0xbe, 0x8a, 0x4d, 0x6e, 0x17, 0xaa, 0x89, 0xc4,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8001);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8001);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8001);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8002
+const uint8_t kDevelopmentDAC_Cert_FFF2_8002[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x37, 0xf7, 0x7e, 0x87, 0x49, 0xb6,
+    0xab, 0x97, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x32, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xe6, 0x6c, 0xaf, 0xaf, 0xe9, 0x26, 0x30, 0x9c,
+    0x4b, 0x8c, 0x10, 0xac, 0x3a, 0xe1, 0xd5, 0xd4, 0xb0, 0x55, 0x7c, 0x90, 0xad, 0x11, 0x5d, 0xed, 0x6c, 0x06, 0x08, 0x1a, 0xec,
+    0x30, 0x21, 0x30, 0x4d, 0xff, 0xa2, 0xe8, 0x6d, 0xac, 0x6b, 0x5a, 0x1c, 0x8b, 0x8f, 0xba, 0x53, 0xb6, 0xef, 0x5d, 0x10, 0x8c,
+    0x38, 0xec, 0x92, 0xf9, 0xf9, 0xf3, 0xd2, 0x4d, 0xb1, 0xb7, 0xb0, 0x8e, 0xb7, 0xdc, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xcd, 0x30, 0xb4, 0x5c,
+    0x37, 0xf9, 0xae, 0xf0, 0x0f, 0xa5, 0xb6, 0xe7, 0x71, 0x55, 0x37, 0x84, 0xc3, 0xa4, 0xc4, 0x63, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0x91, 0x4c, 0x5b, 0xdd, 0x0d, 0xae, 0xd6, 0x6e, 0x10, 0x84, 0x02, 0xeb, 0x6f, 0xaa, 0xca,
+    0x14, 0x3c, 0x8d, 0xc2, 0xba, 0x4c, 0x2e, 0xb4, 0x50, 0x9e, 0x7d, 0x69, 0x25, 0x74, 0x2a, 0x99, 0xfe, 0x02, 0x20, 0x62, 0x95,
+    0x5b, 0x42, 0x15, 0x53, 0x15, 0xeb, 0xf1, 0x83, 0x91, 0x4f, 0x50, 0x8d, 0x14, 0xc9, 0x31, 0x87, 0x50, 0x97, 0xa6, 0xf6, 0x76,
+    0x1c, 0x60, 0x5d, 0x8a, 0xac, 0x6e, 0xd9, 0xae, 0xaa,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8002[65] = {
+    0x04, 0xe6, 0x6c, 0xaf, 0xaf, 0xe9, 0x26, 0x30, 0x9c, 0x4b, 0x8c, 0x10, 0xac, 0x3a, 0xe1, 0xd5, 0xd4,
+    0xb0, 0x55, 0x7c, 0x90, 0xad, 0x11, 0x5d, 0xed, 0x6c, 0x06, 0x08, 0x1a, 0xec, 0x30, 0x21, 0x30, 0x4d,
+    0xff, 0xa2, 0xe8, 0x6d, 0xac, 0x6b, 0x5a, 0x1c, 0x8b, 0x8f, 0xba, 0x53, 0xb6, 0xef, 0x5d, 0x10, 0x8c,
+    0x38, 0xec, 0x92, 0xf9, 0xf9, 0xf3, 0xd2, 0x4d, 0xb1, 0xb7, 0xb0, 0x8e, 0xb7, 0xdc,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8002[32] = {
+    0x4e, 0xee, 0x34, 0xb2, 0xa9, 0x76, 0x96, 0xa5, 0x48, 0x4f, 0xb4, 0xfb, 0xca, 0xf3, 0x5d, 0xb5,
+    0x79, 0xbc, 0x22, 0x4a, 0x59, 0x8c, 0xf5, 0xca, 0x37, 0x21, 0x43, 0x5e, 0x8c, 0xf4, 0x73, 0x57,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8002);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8002);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8002);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8003
+const uint8_t kDevelopmentDAC_Cert_FFF2_8003[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x62, 0xe7, 0xc3, 0x52, 0x31, 0x54,
+    0x61, 0xb7, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x33, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x7f, 0xe1, 0x64, 0x61, 0x3c, 0xd4, 0xd0, 0x94,
+    0xd3, 0xf1, 0x50, 0xe9, 0xe7, 0xa5, 0x21, 0x57, 0xb5, 0xa1, 0x89, 0x70, 0xda, 0xf2, 0x61, 0x34, 0xa5, 0xbe, 0xcd, 0x8a, 0x8c,
+    0xa5, 0xe4, 0xa2, 0xbb, 0x9c, 0xba, 0x99, 0x69, 0xa5, 0xe9, 0x4f, 0x4b, 0x35, 0xfb, 0x9a, 0x16, 0x89, 0xfc, 0x90, 0xe0, 0xa4,
+    0x4f, 0x3d, 0xaf, 0xa9, 0x07, 0x60, 0x2e, 0x13, 0x70, 0xeb, 0x88, 0xd4, 0xca, 0xe1, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x2c, 0xff, 0xa0, 0xbd,
+    0x88, 0xef, 0x51, 0x67, 0xfd, 0xcc, 0x2e, 0xf8, 0x94, 0x07, 0xf4, 0x25, 0xfd, 0x7e, 0x93, 0xec, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x08, 0x83, 0x22, 0x7a, 0xaa, 0x52, 0x79, 0x08, 0x3e, 0xb6, 0xfd, 0xb3, 0x93, 0xbb, 0x8f, 0x74,
+    0x0b, 0x5e, 0xcc, 0x8c, 0xa3, 0x71, 0xeb, 0x43, 0x36, 0x1e, 0xd6, 0x24, 0x7c, 0x15, 0x31, 0x7d, 0x02, 0x21, 0x00, 0xd4, 0xa0,
+    0x9f, 0x8d, 0x25, 0xa6, 0xf2, 0xa0, 0xf7, 0xcc, 0xa6, 0xad, 0xe7, 0xad, 0xba, 0x22, 0x36, 0xe5, 0xaa, 0x54, 0x11, 0xec, 0x46,
+    0xf2, 0xea, 0xa5, 0x51, 0x4b, 0x92, 0xd5, 0x6d, 0x2c,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8003[65] = {
+    0x04, 0x7f, 0xe1, 0x64, 0x61, 0x3c, 0xd4, 0xd0, 0x94, 0xd3, 0xf1, 0x50, 0xe9, 0xe7, 0xa5, 0x21, 0x57,
+    0xb5, 0xa1, 0x89, 0x70, 0xda, 0xf2, 0x61, 0x34, 0xa5, 0xbe, 0xcd, 0x8a, 0x8c, 0xa5, 0xe4, 0xa2, 0xbb,
+    0x9c, 0xba, 0x99, 0x69, 0xa5, 0xe9, 0x4f, 0x4b, 0x35, 0xfb, 0x9a, 0x16, 0x89, 0xfc, 0x90, 0xe0, 0xa4,
+    0x4f, 0x3d, 0xaf, 0xa9, 0x07, 0x60, 0x2e, 0x13, 0x70, 0xeb, 0x88, 0xd4, 0xca, 0xe1,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8003[32] = {
+    0x5c, 0x3e, 0xbf, 0x44, 0x5e, 0x8b, 0x52, 0x7f, 0xf8, 0x14, 0x57, 0x0a, 0x19, 0x13, 0x9c, 0x48,
+    0x7d, 0x49, 0x3b, 0x0b, 0x73, 0x1a, 0xc5, 0x14, 0x0a, 0x78, 0x8b, 0x94, 0xb7, 0x43, 0x53, 0x60,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8003);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8003);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8003);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8004
+const uint8_t kDevelopmentDAC_Cert_FFF2_8004[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x65, 0x11, 0x67, 0x32, 0x53, 0x2b,
+    0xc2, 0x74, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x34, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x34, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xf8, 0x44, 0xee, 0x5a, 0x07, 0x7c, 0x27, 0x9b,
+    0x82, 0x0c, 0x16, 0xf7, 0x0e, 0xa8, 0x45, 0x1f, 0x1f, 0xac, 0xce, 0xcb, 0x8a, 0x14, 0x45, 0x3a, 0xab, 0xff, 0xbd, 0x1f, 0x41,
+    0x19, 0xe5, 0xde, 0x91, 0x70, 0x31, 0x8d, 0x8e, 0xaa, 0x10, 0x02, 0x5b, 0x44, 0xda, 0x5b, 0xc8, 0x4e, 0x89, 0xac, 0xbc, 0x6f,
+    0xb9, 0x31, 0xa1, 0x47, 0x50, 0x66, 0x5b, 0x48, 0x88, 0x1f, 0x82, 0xf0, 0xd6, 0x34, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xbc, 0xb0, 0x7a, 0x1e,
+    0xcb, 0x2e, 0xcb, 0x6e, 0xc9, 0x82, 0x4e, 0x3d, 0xc6, 0x54, 0xb9, 0x18, 0x51, 0x22, 0x76, 0x06, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xa0, 0x61, 0xf3, 0xc9, 0x04, 0xf1, 0x3d, 0xe0, 0x68, 0x29, 0xb6, 0xfd, 0x36, 0xf0, 0x9d,
+    0xfc, 0x74, 0x63, 0xa1, 0x63, 0x47, 0x3e, 0x26, 0x0b, 0xcb, 0xb9, 0x28, 0xf5, 0x18, 0x2c, 0x19, 0x36, 0x02, 0x21, 0x00, 0xe6,
+    0xc1, 0x18, 0xe6, 0xb0, 0x2f, 0x7b, 0x5e, 0x7d, 0x19, 0x2b, 0xef, 0x19, 0x94, 0x0a, 0x86, 0x79, 0x36, 0xc0, 0xab, 0x7e, 0xe4,
+    0x82, 0x11, 0x2b, 0x52, 0x74, 0x75, 0x94, 0xbb, 0x05, 0xbd,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8004[65] = {
+    0x04, 0xf8, 0x44, 0xee, 0x5a, 0x07, 0x7c, 0x27, 0x9b, 0x82, 0x0c, 0x16, 0xf7, 0x0e, 0xa8, 0x45, 0x1f,
+    0x1f, 0xac, 0xce, 0xcb, 0x8a, 0x14, 0x45, 0x3a, 0xab, 0xff, 0xbd, 0x1f, 0x41, 0x19, 0xe5, 0xde, 0x91,
+    0x70, 0x31, 0x8d, 0x8e, 0xaa, 0x10, 0x02, 0x5b, 0x44, 0xda, 0x5b, 0xc8, 0x4e, 0x89, 0xac, 0xbc, 0x6f,
+    0xb9, 0x31, 0xa1, 0x47, 0x50, 0x66, 0x5b, 0x48, 0x88, 0x1f, 0x82, 0xf0, 0xd6, 0x34,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8004[32] = {
+    0x28, 0xf5, 0x27, 0x33, 0x3e, 0x9b, 0xba, 0x3c, 0xce, 0x25, 0xef, 0xc8, 0x3d, 0x03, 0xdf, 0xeb,
+    0x51, 0xc8, 0xe8, 0xbc, 0xfc, 0x9c, 0xf6, 0xf5, 0x86, 0x9c, 0xc5, 0x0a, 0xa1, 0x26, 0xf0, 0xf3,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8004);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8004);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8004);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8005
+const uint8_t kDevelopmentDAC_Cert_FFF2_8005[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x73, 0xa2, 0x1d, 0x0e, 0x54, 0x33,
+    0x71, 0x3a, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x35, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x35, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xb5, 0xd4, 0xc0, 0x26, 0x06, 0x50, 0x86, 0x6d,
+    0x76, 0xfb, 0x0e, 0x54, 0x72, 0xa7, 0xa9, 0x9f, 0x76, 0xc4, 0xac, 0xb6, 0xe4, 0x0d, 0x31, 0xec, 0x3e, 0xa6, 0x45, 0x35, 0x2e,
+    0x5f, 0xe8, 0x41, 0x49, 0x34, 0x69, 0xbe, 0x36, 0x5a, 0xb6, 0xec, 0x2e, 0x9e, 0x4b, 0x58, 0xfe, 0x39, 0x77, 0xbe, 0x10, 0x7b,
+    0xc0, 0xa3, 0xb2, 0x93, 0x37, 0x30, 0xa1, 0x24, 0xd9, 0x11, 0xf8, 0x19, 0xce, 0x2e, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x92, 0xb6, 0x50, 0x19,
+    0x78, 0x04, 0x24, 0x4c, 0x9a, 0x39, 0x91, 0xd1, 0x0b, 0x44, 0x01, 0xc3, 0xc9, 0xa8, 0x7f, 0xb0, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x5d, 0xbb, 0x9f, 0x81, 0x4c, 0x6f, 0xdb, 0xba, 0xac, 0x29, 0x1c, 0x8f, 0x85, 0x6e, 0x97, 0xe3,
+    0xb2, 0x08, 0xca, 0x1a, 0x47, 0xe8, 0xba, 0x65, 0x39, 0x98, 0xbc, 0x3c, 0x51, 0x76, 0x95, 0xf5, 0x02, 0x20, 0x4f, 0x30, 0xd4,
+    0xb5, 0x10, 0xcc, 0x4b, 0x62, 0x17, 0xc0, 0x67, 0xe1, 0x60, 0xba, 0xba, 0x5a, 0xa8, 0x6f, 0x12, 0xf7, 0xcf, 0x68, 0x5d, 0x33,
+    0xab, 0xe3, 0x6f, 0x63, 0x1a, 0x49, 0x1b, 0x3a,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8005[65] = {
+    0x04, 0xb5, 0xd4, 0xc0, 0x26, 0x06, 0x50, 0x86, 0x6d, 0x76, 0xfb, 0x0e, 0x54, 0x72, 0xa7, 0xa9, 0x9f,
+    0x76, 0xc4, 0xac, 0xb6, 0xe4, 0x0d, 0x31, 0xec, 0x3e, 0xa6, 0x45, 0x35, 0x2e, 0x5f, 0xe8, 0x41, 0x49,
+    0x34, 0x69, 0xbe, 0x36, 0x5a, 0xb6, 0xec, 0x2e, 0x9e, 0x4b, 0x58, 0xfe, 0x39, 0x77, 0xbe, 0x10, 0x7b,
+    0xc0, 0xa3, 0xb2, 0x93, 0x37, 0x30, 0xa1, 0x24, 0xd9, 0x11, 0xf8, 0x19, 0xce, 0x2e,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8005[32] = {
+    0xd2, 0x54, 0x77, 0x2b, 0x69, 0x10, 0x90, 0xdd, 0x31, 0x17, 0x49, 0x0b, 0x88, 0x82, 0x68, 0x4b,
+    0x20, 0x65, 0x72, 0x63, 0x10, 0x80, 0xb5, 0xcd, 0x70, 0xd1, 0x36, 0xbb, 0x4d, 0x2a, 0xa3, 0x13,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8005);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8005);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8005);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8006
+const uint8_t kDevelopmentDAC_Cert_FFF2_8006[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x05, 0xfd, 0x55, 0x73, 0xfc, 0x38,
+    0xf6, 0x11, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x36, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x36, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x6a, 0x81, 0x6a, 0x36, 0x1a, 0xab, 0xc5, 0x62,
+    0x90, 0x47, 0xe6, 0xb7, 0xef, 0xb2, 0xc2, 0xa4, 0x64, 0x95, 0xa6, 0x78, 0x92, 0x20, 0x71, 0x8b, 0x6f, 0x47, 0x77, 0x07, 0xfb,
+    0x52, 0x98, 0xe9, 0xe3, 0x31, 0x5a, 0x4b, 0x9c, 0xc7, 0xa7, 0x8b, 0x60, 0xd6, 0x38, 0xe0, 0x2a, 0x3b, 0xa5, 0x7a, 0x6c, 0x93,
+    0xfe, 0x94, 0x89, 0x68, 0xef, 0x04, 0x1f, 0xb9, 0x7b, 0xc2, 0xce, 0x99, 0x1e, 0x50, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x88, 0x39, 0x79, 0xf1,
+    0xd2, 0xd7, 0x20, 0x23, 0x15, 0x4d, 0xdf, 0x08, 0x0f, 0x98, 0x69, 0x51, 0x5d, 0x28, 0x97, 0x6b, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x0a, 0xee, 0xc6, 0xb2, 0x18, 0x96, 0x47, 0xd5, 0xb1, 0x02, 0x95, 0xbe, 0xcb, 0xd8, 0xa4, 0x89,
+    0x39, 0x44, 0x39, 0x4d, 0x2c, 0x13, 0x62, 0x3d, 0x6a, 0xc6, 0xab, 0x0a, 0x2a, 0x58, 0x6e, 0x3c, 0x02, 0x20, 0x5e, 0x2b, 0xd5,
+    0x19, 0xb6, 0x54, 0xb7, 0xab, 0xf3, 0xe7, 0x11, 0x53, 0x9d, 0x25, 0x65, 0x3f, 0x33, 0x10, 0xb9, 0xe2, 0x31, 0x2a, 0x48, 0xd3,
+    0x81, 0xe5, 0x41, 0x97, 0x45, 0xe9, 0x71, 0x74,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8006[65] = {
+    0x04, 0x6a, 0x81, 0x6a, 0x36, 0x1a, 0xab, 0xc5, 0x62, 0x90, 0x47, 0xe6, 0xb7, 0xef, 0xb2, 0xc2, 0xa4,
+    0x64, 0x95, 0xa6, 0x78, 0x92, 0x20, 0x71, 0x8b, 0x6f, 0x47, 0x77, 0x07, 0xfb, 0x52, 0x98, 0xe9, 0xe3,
+    0x31, 0x5a, 0x4b, 0x9c, 0xc7, 0xa7, 0x8b, 0x60, 0xd6, 0x38, 0xe0, 0x2a, 0x3b, 0xa5, 0x7a, 0x6c, 0x93,
+    0xfe, 0x94, 0x89, 0x68, 0xef, 0x04, 0x1f, 0xb9, 0x7b, 0xc2, 0xce, 0x99, 0x1e, 0x50,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8006[32] = {
+    0xe4, 0x35, 0xb9, 0x06, 0x09, 0x25, 0x1f, 0xbc, 0xed, 0x19, 0xed, 0x67, 0xe5, 0x6d, 0x03, 0xaf,
+    0xc9, 0x15, 0xf1, 0x13, 0xa8, 0x7a, 0x09, 0xc8, 0x1b, 0x7e, 0xf2, 0xe1, 0x72, 0x20, 0xe4, 0x79,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8006);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8006);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8006);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8007
+const uint8_t kDevelopmentDAC_Cert_FFF2_8007[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x1d, 0xd7, 0x91, 0xe8, 0x31, 0x4a,
+    0xde, 0x93, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x37, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x37, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x56, 0xc0, 0x98, 0x13, 0x83, 0x59, 0x1d, 0x48,
+    0x15, 0xc7, 0x0f, 0xd2, 0x35, 0x17, 0x38, 0xf3, 0xb6, 0x2e, 0x09, 0xdb, 0xee, 0xa3, 0xce, 0x5d, 0x05, 0x59, 0xd3, 0xaf, 0xe7,
+    0xab, 0xec, 0x9d, 0xbe, 0xd7, 0xb4, 0x14, 0x25, 0xf8, 0x90, 0x20, 0x37, 0xa9, 0xd5, 0xb5, 0x7c, 0x4c, 0x27, 0x6a, 0xa9, 0x88,
+    0x00, 0x73, 0x7e, 0xe1, 0xc1, 0x35, 0x63, 0x66, 0x32, 0x04, 0x69, 0x70, 0x42, 0x48, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xcb, 0x40, 0xe6, 0x29,
+    0x95, 0x41, 0x77, 0x5d, 0x1b, 0x57, 0x41, 0x7a, 0xaf, 0xb6, 0xdb, 0xaa, 0x3b, 0x70, 0x63, 0x93, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x19, 0x6a, 0x0b, 0xa8, 0xa1, 0x2d, 0x02, 0x27, 0x6b, 0x5f, 0x42, 0xde, 0xe0, 0x1e, 0xb1, 0xa0,
+    0x6d, 0xfb, 0x6c, 0x5c, 0xb4, 0x65, 0xec, 0x4c, 0xc9, 0x9d, 0x88, 0x0d, 0xe0, 0x68, 0x1b, 0x02, 0x02, 0x21, 0x00, 0xba, 0x87,
+    0x35, 0x55, 0x9c, 0x18, 0x4c, 0x77, 0x1f, 0x4d, 0x8b, 0xb6, 0xff, 0x36, 0x48, 0xbf, 0xd3, 0x52, 0x75, 0x83, 0x04, 0xd6, 0x58,
+    0x5f, 0xc3, 0x1b, 0x76, 0x51, 0x51, 0xf9, 0x86, 0x39,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8007[65] = {
+    0x04, 0x56, 0xc0, 0x98, 0x13, 0x83, 0x59, 0x1d, 0x48, 0x15, 0xc7, 0x0f, 0xd2, 0x35, 0x17, 0x38, 0xf3,
+    0xb6, 0x2e, 0x09, 0xdb, 0xee, 0xa3, 0xce, 0x5d, 0x05, 0x59, 0xd3, 0xaf, 0xe7, 0xab, 0xec, 0x9d, 0xbe,
+    0xd7, 0xb4, 0x14, 0x25, 0xf8, 0x90, 0x20, 0x37, 0xa9, 0xd5, 0xb5, 0x7c, 0x4c, 0x27, 0x6a, 0xa9, 0x88,
+    0x00, 0x73, 0x7e, 0xe1, 0xc1, 0x35, 0x63, 0x66, 0x32, 0x04, 0x69, 0x70, 0x42, 0x48,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8007[32] = {
+    0x53, 0xf1, 0xab, 0x10, 0xe6, 0xa7, 0x97, 0x4e, 0xae, 0x31, 0x04, 0xb1, 0x5c, 0x65, 0x46, 0xf1,
+    0x38, 0x4c, 0xd3, 0x6a, 0x50, 0x78, 0xc8, 0xe5, 0x1e, 0x65, 0xeb, 0x38, 0x06, 0x0a, 0xf4, 0xa1,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8007);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8007);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8007);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8008
+const uint8_t kDevelopmentDAC_Cert_FFF2_8008[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x02, 0x6e, 0x54, 0x7c, 0xb2, 0xb5,
+    0xa5, 0x83, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x38, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x38, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x52, 0x74, 0xc7, 0x1e, 0x56, 0x96, 0x91, 0x81,
+    0x97, 0x04, 0xc9, 0x36, 0x3e, 0xaf, 0x13, 0x21, 0x42, 0x0d, 0x99, 0x64, 0x93, 0xcc, 0x2f, 0xf7, 0x9d, 0xd5, 0x4d, 0x48, 0xce,
+    0x19, 0xbe, 0xd2, 0x65, 0x6a, 0xe7, 0xf9, 0xdd, 0xa6, 0x71, 0x29, 0x17, 0x91, 0x4b, 0x74, 0xe9, 0x16, 0xa1, 0x3c, 0x76, 0xe5,
+    0x56, 0x63, 0xb3, 0xd9, 0x9d, 0xb8, 0x01, 0x11, 0x70, 0x56, 0x9d, 0x73, 0xec, 0xa4, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x8a, 0x87, 0xfc, 0xd4,
+    0x33, 0x97, 0x83, 0x4a, 0xc1, 0xaa, 0x30, 0xe3, 0x40, 0xcf, 0xcc, 0xbf, 0xeb, 0x57, 0xea, 0x5b, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x0b, 0x21, 0x53, 0xf4, 0xa9, 0xc4, 0xde, 0xba, 0x0e, 0x48, 0xd6, 0x64, 0xe8, 0xc3, 0xc8, 0x23,
+    0x4f, 0xf7, 0x97, 0x66, 0xa5, 0x1e, 0x10, 0xcf, 0x96, 0xdb, 0x18, 0xf8, 0xc2, 0x3b, 0xf1, 0xb3, 0x02, 0x21, 0x00, 0x8a, 0x7c,
+    0x00, 0xbe, 0x52, 0x99, 0x0d, 0x11, 0x9b, 0xd4, 0x07, 0xdc, 0xc1, 0x01, 0xb8, 0x59, 0x87, 0x44, 0x51, 0xd0, 0x30, 0x18, 0x94,
+    0x08, 0x7b, 0x4a, 0xfb, 0xfb, 0xe6, 0xa2, 0x36, 0xf0,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8008[65] = {
+    0x04, 0x52, 0x74, 0xc7, 0x1e, 0x56, 0x96, 0x91, 0x81, 0x97, 0x04, 0xc9, 0x36, 0x3e, 0xaf, 0x13, 0x21,
+    0x42, 0x0d, 0x99, 0x64, 0x93, 0xcc, 0x2f, 0xf7, 0x9d, 0xd5, 0x4d, 0x48, 0xce, 0x19, 0xbe, 0xd2, 0x65,
+    0x6a, 0xe7, 0xf9, 0xdd, 0xa6, 0x71, 0x29, 0x17, 0x91, 0x4b, 0x74, 0xe9, 0x16, 0xa1, 0x3c, 0x76, 0xe5,
+    0x56, 0x63, 0xb3, 0xd9, 0x9d, 0xb8, 0x01, 0x11, 0x70, 0x56, 0x9d, 0x73, 0xec, 0xa4,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8008[32] = {
+    0xb7, 0x10, 0x47, 0xb0, 0xbb, 0xdb, 0xc7, 0x22, 0x51, 0xba, 0xd3, 0xe3, 0x6d, 0xfe, 0x5c, 0xac,
+    0xf9, 0x0f, 0xca, 0xae, 0x26, 0xe2, 0xf1, 0x57, 0x7b, 0xd1, 0xb3, 0xca, 0x3c, 0xbb, 0xb8, 0xcf,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8008);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8008);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8008);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8009
+const uint8_t kDevelopmentDAC_Cert_FFF2_8009[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x3d, 0xd8, 0x41, 0x54, 0x03, 0x0f,
+    0x86, 0xd4, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x39, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x39, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xfb, 0x5c, 0x85, 0x0a, 0xd5, 0x9b, 0xc1, 0xcb,
+    0x7f, 0x95, 0xa4, 0x1c, 0xa6, 0x5b, 0x11, 0x5b, 0x7d, 0x16, 0x75, 0x97, 0xd4, 0x63, 0x3a, 0x02, 0x33, 0x2c, 0x76, 0x96, 0x53,
+    0xff, 0xeb, 0x6d, 0x6f, 0x73, 0x40, 0x21, 0xa8, 0x85, 0xe1, 0xdb, 0xf6, 0x11, 0x34, 0xe4, 0x5f, 0xa3, 0xf1, 0xcf, 0xcd, 0x30,
+    0xee, 0x8b, 0x01, 0x31, 0x2a, 0x94, 0xf1, 0x76, 0x41, 0xd2, 0xc0, 0x71, 0xb9, 0x7d, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x6f, 0xb3, 0xa1, 0xbd,
+    0x02, 0xa6, 0xa0, 0x28, 0x92, 0xf9, 0x53, 0xbb, 0x25, 0xfe, 0x06, 0x5b, 0x81, 0x95, 0xc0, 0xcb, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xe5, 0x7b, 0x68, 0xcd, 0x17, 0x5b, 0x18, 0x2a, 0xc3, 0x94, 0xbf, 0x85, 0x37, 0x7f, 0x8b,
+    0xa0, 0x9c, 0x0e, 0x9d, 0x72, 0xe8, 0xd0, 0x05, 0x6d, 0x2f, 0x23, 0xb2, 0x26, 0xf9, 0x5c, 0x36, 0x57, 0x02, 0x21, 0x00, 0xc3,
+    0xbd, 0xb3, 0xe0, 0xc9, 0x9f, 0x52, 0x06, 0xd2, 0x9b, 0x29, 0x91, 0x7d, 0xe1, 0xc1, 0xcc, 0x07, 0xe7, 0x24, 0x0d, 0xd7, 0x2c,
+    0x1b, 0xb2, 0x5c, 0x99, 0x12, 0xf9, 0x45, 0x30, 0xc8, 0x5a,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8009[65] = {
+    0x04, 0xfb, 0x5c, 0x85, 0x0a, 0xd5, 0x9b, 0xc1, 0xcb, 0x7f, 0x95, 0xa4, 0x1c, 0xa6, 0x5b, 0x11, 0x5b,
+    0x7d, 0x16, 0x75, 0x97, 0xd4, 0x63, 0x3a, 0x02, 0x33, 0x2c, 0x76, 0x96, 0x53, 0xff, 0xeb, 0x6d, 0x6f,
+    0x73, 0x40, 0x21, 0xa8, 0x85, 0xe1, 0xdb, 0xf6, 0x11, 0x34, 0xe4, 0x5f, 0xa3, 0xf1, 0xcf, 0xcd, 0x30,
+    0xee, 0x8b, 0x01, 0x31, 0x2a, 0x94, 0xf1, 0x76, 0x41, 0xd2, 0xc0, 0x71, 0xb9, 0x7d,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8009[32] = {
+    0xb4, 0x35, 0x9a, 0xce, 0x54, 0x2c, 0xac, 0x9a, 0xc6, 0xe3, 0x4a, 0xad, 0xa2, 0x09, 0xbb, 0xb7,
+    0xe6, 0x91, 0x12, 0x60, 0xfa, 0xeb, 0x47, 0x42, 0xbb, 0x56, 0x32, 0xe5, 0xbf, 0xfe, 0x2f, 0x74,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8009);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8009);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8009);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800A
+const uint8_t kDevelopmentDAC_Cert_FFF2_800A[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x72, 0x65, 0xa7, 0xd8, 0x44, 0x77,
+    0xd2, 0x64, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x41, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x41, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x19, 0xb6, 0x16, 0xf3, 0x43, 0x4c, 0x12, 0x59,
+    0xcb, 0x60, 0xf6, 0x29, 0x00, 0x3e, 0x96, 0x1c, 0x0a, 0x14, 0x0d, 0x5a, 0xc3, 0xdd, 0x70, 0xec, 0x96, 0xb7, 0x17, 0xc9, 0x9c,
+    0xb0, 0x66, 0x3e, 0x1b, 0xb9, 0x3d, 0x28, 0xb0, 0xcc, 0x08, 0xee, 0xd7, 0x9a, 0xff, 0x6c, 0x42, 0x79, 0x2e, 0xde, 0xdb, 0xa8,
+    0x22, 0xba, 0xca, 0x52, 0x8a, 0x06, 0xbb, 0x7a, 0xa9, 0x42, 0xc2, 0xdc, 0xff, 0x1c, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x45, 0xdc, 0x53, 0x50,
+    0xce, 0x2c, 0xae, 0xcb, 0xcc, 0x50, 0x4a, 0x53, 0x4b, 0x04, 0x28, 0x14, 0x7a, 0x15, 0xd8, 0x35, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x10, 0x1d, 0x16, 0x31, 0x8c, 0xf8, 0xde, 0xe3, 0x2a, 0xba, 0xca, 0xa4, 0x52, 0x46, 0xf5, 0x8b,
+    0x35, 0x6e, 0x15, 0xb6, 0x39, 0x16, 0xa0, 0x43, 0x4b, 0x31, 0xcf, 0x23, 0x97, 0x14, 0x95, 0x5f, 0x02, 0x20, 0x69, 0x7c, 0x40,
+    0xe1, 0xfb, 0xa2, 0x22, 0xc4, 0x74, 0xcf, 0x2c, 0x92, 0x37, 0xb4, 0x5e, 0x50, 0xcf, 0xf7, 0x87, 0x1e, 0x67, 0x38, 0x7b, 0x1a,
+    0xfd, 0xb4, 0x9e, 0x4d, 0xbf, 0x57, 0xeb, 0xfe,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_800A[65] = {
+    0x04, 0x19, 0xb6, 0x16, 0xf3, 0x43, 0x4c, 0x12, 0x59, 0xcb, 0x60, 0xf6, 0x29, 0x00, 0x3e, 0x96, 0x1c,
+    0x0a, 0x14, 0x0d, 0x5a, 0xc3, 0xdd, 0x70, 0xec, 0x96, 0xb7, 0x17, 0xc9, 0x9c, 0xb0, 0x66, 0x3e, 0x1b,
+    0xb9, 0x3d, 0x28, 0xb0, 0xcc, 0x08, 0xee, 0xd7, 0x9a, 0xff, 0x6c, 0x42, 0x79, 0x2e, 0xde, 0xdb, 0xa8,
+    0x22, 0xba, 0xca, 0x52, 0x8a, 0x06, 0xbb, 0x7a, 0xa9, 0x42, 0xc2, 0xdc, 0xff, 0x1c,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800A[32] = {
+    0x55, 0x2d, 0xf7, 0xbf, 0x75, 0x23, 0x53, 0x88, 0x11, 0x9f, 0x85, 0x4c, 0x8f, 0x0f, 0xd9, 0xb5,
+    0xaf, 0xc0, 0xcf, 0x86, 0xd4, 0x8a, 0xe9, 0xe8, 0x6a, 0x50, 0x62, 0x3c, 0xb3, 0x8f, 0xb0, 0xc1,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_800A);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_800A);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_800A);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800B
+const uint8_t kDevelopmentDAC_Cert_FFF2_800B[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x75, 0x76, 0x48, 0x3b, 0xca, 0xda,
+    0x0f, 0x0a, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x42, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x42, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xeb, 0xc5, 0x10, 0xa1, 0x46, 0x3d, 0x11, 0xe4,
+    0x44, 0x57, 0x09, 0xba, 0x96, 0xab, 0x5c, 0x35, 0xdf, 0xf7, 0x30, 0xc5, 0xcb, 0x0c, 0x37, 0x0e, 0x20, 0xbb, 0x1b, 0xb6, 0x2e,
+    0x2d, 0x2a, 0x64, 0xaa, 0xc1, 0x91, 0xe9, 0x76, 0xda, 0x1f, 0x6d, 0x64, 0xe8, 0xd5, 0x6a, 0x6f, 0xf1, 0x2e, 0x39, 0xb2, 0x45,
+    0x69, 0x14, 0x9b, 0x23, 0xee, 0x30, 0x4c, 0xbd, 0xeb, 0x01, 0x1f, 0x44, 0xb5, 0x91, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x7a, 0x5d, 0x20, 0x90,
+    0x62, 0xe7, 0xe3, 0x40, 0xe8, 0xbc, 0xa3, 0xb0, 0x78, 0x10, 0xe4, 0x40, 0xeb, 0x41, 0x19, 0x31, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x0a, 0x0d, 0x3c, 0x92, 0x97, 0x4a, 0xdb, 0x11, 0x6b, 0x87, 0xd6, 0x08, 0x0e, 0x00, 0x72, 0xb8,
+    0xbf, 0x42, 0x6c, 0xe6, 0x2b, 0xee, 0x3e, 0x48, 0x2c, 0xd4, 0x5d, 0xa3, 0x81, 0xc5, 0xa6, 0x5c, 0x02, 0x21, 0x00, 0xf4, 0xa1,
+    0xf0, 0xc9, 0x1c, 0x77, 0x24, 0xc8, 0xc2, 0x8f, 0x38, 0x82, 0x45, 0xf9, 0xb8, 0xc8, 0xd3, 0xe3, 0xad, 0x35, 0x2a, 0xee, 0x86,
+    0x56, 0x8f, 0xf8, 0x60, 0x40, 0x83, 0xb9, 0x0f, 0x43,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_800B[65] = {
+    0x04, 0xeb, 0xc5, 0x10, 0xa1, 0x46, 0x3d, 0x11, 0xe4, 0x44, 0x57, 0x09, 0xba, 0x96, 0xab, 0x5c, 0x35,
+    0xdf, 0xf7, 0x30, 0xc5, 0xcb, 0x0c, 0x37, 0x0e, 0x20, 0xbb, 0x1b, 0xb6, 0x2e, 0x2d, 0x2a, 0x64, 0xaa,
+    0xc1, 0x91, 0xe9, 0x76, 0xda, 0x1f, 0x6d, 0x64, 0xe8, 0xd5, 0x6a, 0x6f, 0xf1, 0x2e, 0x39, 0xb2, 0x45,
+    0x69, 0x14, 0x9b, 0x23, 0xee, 0x30, 0x4c, 0xbd, 0xeb, 0x01, 0x1f, 0x44, 0xb5, 0x91,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800B[32] = {
+    0xf4, 0xa0, 0xc4, 0x1a, 0x95, 0x4b, 0x18, 0x37, 0xf8, 0x7b, 0xc0, 0x57, 0x2a, 0xe1, 0xf0, 0xff,
+    0x1f, 0x4c, 0x83, 0x51, 0x5e, 0x13, 0xc0, 0xae, 0x8f, 0xf3, 0xbe, 0x23, 0xc3, 0x10, 0xc2, 0xb3,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_800B);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_800B);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_800B);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800C
+const uint8_t kDevelopmentDAC_Cert_FFF2_800C[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x2a, 0x5f, 0x87, 0x29, 0x51, 0xdd,
+    0x24, 0xc1, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x43, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x43, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x4a, 0x3c, 0x1b, 0x42, 0x9b, 0xc8, 0xdf, 0xd8,
+    0xa6, 0x9f, 0xac, 0x3c, 0x79, 0xee, 0x09, 0x94, 0x7a, 0x71, 0x66, 0x77, 0xe5, 0xed, 0x59, 0x13, 0x29, 0x06, 0xdb, 0x16, 0x0d,
+    0x84, 0xee, 0x39, 0xb6, 0xa7, 0x63, 0x3b, 0x96, 0xd1, 0xa7, 0x99, 0xd5, 0xed, 0xf3, 0x29, 0x23, 0x35, 0x3e, 0xd3, 0xc0, 0x6c,
+    0xf2, 0x2a, 0x42, 0x9d, 0x34, 0x67, 0x6f, 0x80, 0x8c, 0x82, 0xe7, 0x95, 0xbb, 0x88, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x8c, 0x15, 0xcd, 0x1f,
+    0x1a, 0xbb, 0x78, 0x40, 0x9e, 0xec, 0xbb, 0x3f, 0xd4, 0x7f, 0x9c, 0x12, 0xba, 0x7b, 0x70, 0xf6, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xf4, 0xa2, 0x64, 0x29, 0xbd, 0x86, 0x9b, 0x77, 0x9a, 0x21, 0x32, 0x0c, 0x16, 0xeb, 0x3c,
+    0x06, 0xab, 0xb2, 0x2a, 0x6b, 0x5c, 0xc8, 0x8b, 0x6e, 0x98, 0x42, 0x83, 0xed, 0xab, 0x19, 0x56, 0x52, 0x02, 0x20, 0x7d, 0xe0,
+    0x22, 0x90, 0xd6, 0xf4, 0x6d, 0x6e, 0x9b, 0x27, 0xd9, 0xf2, 0xcf, 0xdc, 0x54, 0xec, 0x25, 0x11, 0x82, 0xf2, 0xf5, 0xed, 0x38,
+    0x67, 0x58, 0xcd, 0xe6, 0xd9, 0x14, 0xf1, 0x7b, 0x51,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_800C[65] = {
+    0x04, 0x4a, 0x3c, 0x1b, 0x42, 0x9b, 0xc8, 0xdf, 0xd8, 0xa6, 0x9f, 0xac, 0x3c, 0x79, 0xee, 0x09, 0x94,
+    0x7a, 0x71, 0x66, 0x77, 0xe5, 0xed, 0x59, 0x13, 0x29, 0x06, 0xdb, 0x16, 0x0d, 0x84, 0xee, 0x39, 0xb6,
+    0xa7, 0x63, 0x3b, 0x96, 0xd1, 0xa7, 0x99, 0xd5, 0xed, 0xf3, 0x29, 0x23, 0x35, 0x3e, 0xd3, 0xc0, 0x6c,
+    0xf2, 0x2a, 0x42, 0x9d, 0x34, 0x67, 0x6f, 0x80, 0x8c, 0x82, 0xe7, 0x95, 0xbb, 0x88,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800C[32] = {
+    0x10, 0x3f, 0x33, 0x85, 0x5e, 0x6a, 0xe6, 0xbe, 0x4a, 0xad, 0x76, 0xbb, 0xcd, 0xc3, 0x6f, 0x71,
+    0x9d, 0x1f, 0x5c, 0xad, 0x27, 0x02, 0xfe, 0x24, 0x9c, 0x1a, 0x63, 0x44, 0x34, 0x14, 0x56, 0x75,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_800C);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_800C);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_800C);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800D
+const uint8_t kDevelopmentDAC_Cert_FFF2_800D[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x43, 0x42, 0x90, 0xeb, 0x35, 0xdf,
+    0x5e, 0x88, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x44, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x12, 0x3f, 0xee, 0xcd, 0x86, 0x55, 0x0a, 0xb4,
+    0x6c, 0x0b, 0x29, 0xfa, 0x36, 0x4d, 0xa9, 0x82, 0xd3, 0xa3, 0x7a, 0xf0, 0xe5, 0xfa, 0x15, 0x1a, 0x65, 0x21, 0xd4, 0x81, 0x08,
+    0x36, 0x95, 0xdc, 0x78, 0xaa, 0xe7, 0x6f, 0x5f, 0xda, 0xc0, 0x91, 0x4d, 0x0a, 0x44, 0x34, 0x3b, 0xd6, 0xed, 0x5f, 0xfc, 0xed,
+    0x57, 0x50, 0x94, 0xbe, 0xff, 0x54, 0x6a, 0x3d, 0x4a, 0x7f, 0x05, 0x08, 0x83, 0x92, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xb5, 0xb0, 0x56, 0xc9,
+    0x5d, 0xf7, 0x5f, 0xd1, 0xb4, 0xea, 0x0e, 0x19, 0xb0, 0x13, 0xc4, 0x34, 0x72, 0xf9, 0x9b, 0xe2, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0x9f, 0x64, 0xab, 0x9d, 0x40, 0xc6, 0x4e, 0x02, 0xd6, 0x46, 0x65, 0xd2, 0x98, 0xb3, 0x6c,
+    0x9b, 0x5f, 0x66, 0xee, 0x6d, 0x09, 0xb6, 0xab, 0x97, 0x64, 0x29, 0x13, 0x86, 0xad, 0x3d, 0xc0, 0x3a, 0x02, 0x21, 0x00, 0xe9,
+    0xcd, 0x40, 0xbd, 0xa3, 0xe8, 0x03, 0x35, 0xe5, 0xae, 0x26, 0xc0, 0xb0, 0x7f, 0xea, 0x58, 0x46, 0xa9, 0x86, 0x64, 0xc7, 0x51,
+    0x13, 0xf5, 0x63, 0x67, 0x2f, 0x7c, 0x22, 0xb9, 0x98, 0xbf,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_800D[65] = {
+    0x04, 0x12, 0x3f, 0xee, 0xcd, 0x86, 0x55, 0x0a, 0xb4, 0x6c, 0x0b, 0x29, 0xfa, 0x36, 0x4d, 0xa9, 0x82,
+    0xd3, 0xa3, 0x7a, 0xf0, 0xe5, 0xfa, 0x15, 0x1a, 0x65, 0x21, 0xd4, 0x81, 0x08, 0x36, 0x95, 0xdc, 0x78,
+    0xaa, 0xe7, 0x6f, 0x5f, 0xda, 0xc0, 0x91, 0x4d, 0x0a, 0x44, 0x34, 0x3b, 0xd6, 0xed, 0x5f, 0xfc, 0xed,
+    0x57, 0x50, 0x94, 0xbe, 0xff, 0x54, 0x6a, 0x3d, 0x4a, 0x7f, 0x05, 0x08, 0x83, 0x92,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800D[32] = {
+    0xd5, 0x61, 0xfe, 0x73, 0xd4, 0x75, 0x42, 0x9f, 0xac, 0x2c, 0x49, 0x74, 0x5f, 0x38, 0x98, 0xf1,
+    0x1c, 0xc1, 0xc5, 0x4e, 0x93, 0x7c, 0xa2, 0x55, 0x6b, 0x00, 0x8d, 0x87, 0x69, 0x06, 0x6e, 0x73,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_800D);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_800D);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_800D);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800E
+const uint8_t kDevelopmentDAC_Cert_FFF2_800E[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x0f, 0x7f, 0x82, 0x6b, 0x2a, 0x7f,
+    0xd6, 0x0e, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x45, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x45, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x60, 0x20, 0xca, 0x35, 0x23, 0x8f, 0xd9, 0x9d,
+    0x7d, 0x45, 0xe9, 0x0c, 0x61, 0x2c, 0xcf, 0x84, 0x87, 0x2b, 0x3e, 0xdb, 0xe2, 0xa9, 0x6c, 0x25, 0x22, 0xf3, 0xdc, 0x43, 0x30,
+    0x90, 0xc4, 0xed, 0x44, 0x7b, 0xe9, 0xb9, 0xf0, 0x1f, 0x8e, 0x68, 0x1f, 0x7f, 0x6e, 0x42, 0x03, 0xec, 0xf3, 0x32, 0x7e, 0x51,
+    0xaa, 0x21, 0xde, 0x00, 0x4f, 0xe4, 0x60, 0x5f, 0x45, 0x35, 0xa5, 0x81, 0x2d, 0x20, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x37, 0xf2, 0xce, 0xe4,
+    0x94, 0xcd, 0x3d, 0x76, 0x56, 0x48, 0xce, 0x81, 0x9a, 0x97, 0xb3, 0xc6, 0x48, 0x5f, 0x09, 0x47, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xb3, 0x74, 0x58, 0x85, 0x13, 0xff, 0x09, 0x8d, 0x02, 0xef, 0x59, 0x7d, 0x0f, 0x51, 0xd8,
+    0xef, 0xd1, 0x15, 0x89, 0xac, 0x05, 0x03, 0xc2, 0x12, 0x31, 0x57, 0x1e, 0x1d, 0xfd, 0xac, 0xe8, 0x71, 0x02, 0x21, 0x00, 0xe7,
+    0xce, 0x89, 0x1b, 0x50, 0x0b, 0x6f, 0xd4, 0x7d, 0xe3, 0xb1, 0x33, 0x46, 0x54, 0xed, 0xf2, 0x44, 0x0a, 0x58, 0xec, 0x07, 0x12,
+    0x5b, 0x08, 0xab, 0xda, 0x92, 0xc8, 0xd7, 0x78, 0x7c, 0xed,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_800E[65] = {
+    0x04, 0x60, 0x20, 0xca, 0x35, 0x23, 0x8f, 0xd9, 0x9d, 0x7d, 0x45, 0xe9, 0x0c, 0x61, 0x2c, 0xcf, 0x84,
+    0x87, 0x2b, 0x3e, 0xdb, 0xe2, 0xa9, 0x6c, 0x25, 0x22, 0xf3, 0xdc, 0x43, 0x30, 0x90, 0xc4, 0xed, 0x44,
+    0x7b, 0xe9, 0xb9, 0xf0, 0x1f, 0x8e, 0x68, 0x1f, 0x7f, 0x6e, 0x42, 0x03, 0xec, 0xf3, 0x32, 0x7e, 0x51,
+    0xaa, 0x21, 0xde, 0x00, 0x4f, 0xe4, 0x60, 0x5f, 0x45, 0x35, 0xa5, 0x81, 0x2d, 0x20,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800E[32] = {
+    0xc7, 0x6c, 0x81, 0xef, 0xd3, 0x3e, 0x35, 0xa5, 0x41, 0x07, 0xd8, 0x6a, 0xa7, 0x41, 0x73, 0x92,
+    0x60, 0x95, 0xdf, 0x5d, 0x6c, 0xd7, 0x1a, 0xae, 0xeb, 0x3a, 0xa5, 0x89, 0x37, 0x62, 0x26, 0xd2,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_800E);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_800E);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_800E);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800F
+const uint8_t kDevelopmentDAC_Cert_FFF2_800F[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x5e, 0xba, 0xbd, 0x88, 0x53, 0xc9,
+    0xda, 0x90, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x46, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x46, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x61, 0xc5, 0x39, 0x7e, 0x10, 0x3c, 0x31, 0x4a,
+    0x52, 0x54, 0xd4, 0x15, 0x1f, 0xed, 0x28, 0xd0, 0x12, 0x3a, 0x53, 0x0d, 0x46, 0x20, 0x9e, 0x98, 0xaf, 0x2d, 0xd6, 0xe7, 0x77,
+    0xdd, 0x27, 0xaa, 0xff, 0x3c, 0xf1, 0x96, 0xcc, 0xc1, 0x09, 0x15, 0x9c, 0xf5, 0xdf, 0x71, 0xf6, 0x17, 0xe1, 0x44, 0x58, 0xf5,
+    0x5b, 0xed, 0xc1, 0xed, 0xfb, 0xfd, 0x4d, 0x72, 0x8c, 0xc4, 0x8c, 0xfb, 0xa4, 0x03, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xbe, 0x48, 0xc1, 0x4d,
+    0x30, 0xb1, 0x86, 0x4c, 0x0b, 0x97, 0x07, 0x54, 0xde, 0x82, 0x4e, 0xa8, 0x85, 0xa1, 0x5b, 0xa7, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0x99, 0xc3, 0x2f, 0x1e, 0x78, 0xb2, 0xa9, 0xb0, 0x3e, 0xf7, 0xfa, 0x9d, 0x9a, 0x90, 0x4d,
+    0xbe, 0x6c, 0x00, 0x7f, 0xfa, 0xb5, 0xa5, 0x92, 0x8b, 0x5f, 0x3b, 0x52, 0x36, 0x17, 0x47, 0x91, 0x1c, 0x02, 0x20, 0x09, 0x0d,
+    0xb8, 0x80, 0xd5, 0x64, 0x0f, 0xf1, 0x3b, 0x6e, 0x9c, 0x2e, 0x87, 0x7e, 0x6e, 0xd4, 0x3a, 0x58, 0x26, 0x8d, 0x20, 0xc5, 0xf0,
+    0x50, 0x73, 0x7a, 0xb3, 0xcc, 0xb6, 0xeb, 0x99, 0xe1,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_800F[65] = {
+    0x04, 0x61, 0xc5, 0x39, 0x7e, 0x10, 0x3c, 0x31, 0x4a, 0x52, 0x54, 0xd4, 0x15, 0x1f, 0xed, 0x28, 0xd0,
+    0x12, 0x3a, 0x53, 0x0d, 0x46, 0x20, 0x9e, 0x98, 0xaf, 0x2d, 0xd6, 0xe7, 0x77, 0xdd, 0x27, 0xaa, 0xff,
+    0x3c, 0xf1, 0x96, 0xcc, 0xc1, 0x09, 0x15, 0x9c, 0xf5, 0xdf, 0x71, 0xf6, 0x17, 0xe1, 0x44, 0x58, 0xf5,
+    0x5b, 0xed, 0xc1, 0xed, 0xfb, 0xfd, 0x4d, 0x72, 0x8c, 0xc4, 0x8c, 0xfb, 0xa4, 0x03,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800F[32] = {
+    0xcf, 0xd2, 0x08, 0x01, 0x0b, 0xbb, 0xf8, 0xf8, 0x0e, 0xf4, 0x43, 0x44, 0x10, 0x0f, 0x0d, 0x84,
+    0xc8, 0x16, 0x74, 0xec, 0x06, 0xc0, 0x7b, 0x02, 0x01, 0x71, 0x06, 0x67, 0xa3, 0xa3, 0xbb, 0xb0,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_800F);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_800F);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_800F);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8010
+const uint8_t kDevelopmentDAC_Cert_FFF2_8010[468] = {
+    0x30, 0x82, 0x01, 0xd0, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x2a, 0x98, 0xff, 0x04, 0x80, 0x74,
+    0xa1, 0x06, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x30, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x32, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x30, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x11, 0x8b, 0xde, 0x82, 0x46, 0xeb, 0xed, 0xb7, 0xc3, 0xee, 0xcc,
+    0xd6, 0x69, 0x3e, 0x24, 0x0e, 0x24, 0x06, 0xf6, 0x49, 0x44, 0xd1, 0x54, 0x69, 0xce, 0x00, 0x57, 0xd0, 0xb7, 0xa9, 0x9f, 0x45,
+    0x8f, 0x4b, 0x1b, 0x6f, 0x3d, 0xc5, 0x71, 0x9d, 0xed, 0xad, 0xe0, 0x62, 0x5f, 0xae, 0xc2, 0x8f, 0xa5, 0x0e, 0x37, 0x21, 0x41,
+    0x49, 0xc2, 0xeb, 0x61, 0x55, 0xc1, 0x92, 0x9a, 0xc2, 0xce, 0x28, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x27, 0x5d, 0x1f, 0x35, 0xa3, 0x10, 0x1c,
+    0xc2, 0x9f, 0x07, 0x81, 0x48, 0x76, 0x04, 0x49, 0x48, 0x0f, 0xe6, 0x1e, 0x18, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07, 0x37, 0x8f, 0xf0,
+    0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45,
+    0x02, 0x20, 0x08, 0xd1, 0xe2, 0x17, 0xbb, 0xbe, 0x3d, 0xb1, 0xaa, 0x1e, 0x45, 0x14, 0x4a, 0xe8, 0xc6, 0xf1, 0x4f, 0x07, 0xd6,
+    0x70, 0xed, 0x70, 0x93, 0x26, 0xd3, 0x57, 0x98, 0x21, 0x2f, 0xf5, 0x01, 0x07, 0x02, 0x21, 0x00, 0xcd, 0x53, 0x77, 0xa6, 0x05,
+    0x8c, 0x95, 0x13, 0xbf, 0x75, 0x0b, 0x46, 0xa9, 0x49, 0x12, 0x79, 0x83, 0x8b, 0x49, 0xa1, 0x3c, 0xdb, 0x39, 0xce, 0xa1, 0xd5,
+    0x4b, 0xfd, 0xb3, 0x8d, 0x30, 0xd4,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8010[65] = {
+    0x04, 0x11, 0x8b, 0xde, 0x82, 0x46, 0xeb, 0xed, 0xb7, 0xc3, 0xee, 0xcc, 0xd6, 0x69, 0x3e, 0x24, 0x0e,
+    0x24, 0x06, 0xf6, 0x49, 0x44, 0xd1, 0x54, 0x69, 0xce, 0x00, 0x57, 0xd0, 0xb7, 0xa9, 0x9f, 0x45, 0x8f,
+    0x4b, 0x1b, 0x6f, 0x3d, 0xc5, 0x71, 0x9d, 0xed, 0xad, 0xe0, 0x62, 0x5f, 0xae, 0xc2, 0x8f, 0xa5, 0x0e,
+    0x37, 0x21, 0x41, 0x49, 0xc2, 0xeb, 0x61, 0x55, 0xc1, 0x92, 0x9a, 0xc2, 0xce, 0x28,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8010[32] = {
+    0x60, 0xf2, 0xf7, 0x44, 0xbd, 0x4e, 0x9a, 0x6a, 0xfd, 0x99, 0xad, 0xf2, 0x44, 0x8d, 0xbb, 0x1c,
+    0xc2, 0x88, 0xb8, 0xc2, 0xbe, 0x33, 0xc6, 0xdc, 0x90, 0x56, 0xd8, 0xfd, 0x87, 0xf7, 0xbc, 0x11,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8010);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8010);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8010);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8011
+const uint8_t kDevelopmentDAC_Cert_FFF2_8011[468] = {
+    0x30, 0x82, 0x01, 0xd0, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x21, 0xef, 0x65, 0x38, 0xc0, 0x7a,
+    0x9b, 0xa1, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x31, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x32, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x31, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xa6, 0xaa, 0xac, 0xba, 0x90, 0xce, 0x63, 0x0d, 0x46, 0x05, 0xfb,
+    0x96, 0x2f, 0x97, 0x41, 0x7d, 0x77, 0x6f, 0xbd, 0x4f, 0x73, 0x96, 0x37, 0x9d, 0x10, 0xdc, 0x39, 0xd1, 0x28, 0x5f, 0x43, 0xdb,
+    0xeb, 0x5e, 0xec, 0x1d, 0x0d, 0xec, 0xd1, 0x85, 0xab, 0x38, 0x3d, 0x31, 0x1a, 0x67, 0x62, 0x49, 0xeb, 0xca, 0x90, 0x5e, 0xa6,
+    0x1a, 0x61, 0x47, 0xbe, 0x51, 0xdf, 0x28, 0x05, 0x05, 0xf9, 0x39, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xb4, 0x09, 0x94, 0x3c, 0x21, 0xe3, 0x25,
+    0x0d, 0x1d, 0xea, 0x4a, 0x22, 0x18, 0x68, 0xa2, 0xc8, 0x91, 0xef, 0xc8, 0x3f, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07, 0x37, 0x8f, 0xf0,
+    0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45,
+    0x02, 0x21, 0x00, 0xa0, 0x73, 0x2a, 0x67, 0xf6, 0x53, 0x2d, 0x02, 0xfd, 0x2d, 0x28, 0x82, 0x30, 0x2e, 0x35, 0x21, 0xdd, 0xec,
+    0x05, 0x8e, 0x61, 0xb0, 0x8d, 0x09, 0x61, 0x34, 0x65, 0xb2, 0x03, 0xd1, 0x92, 0x9a, 0x02, 0x20, 0x46, 0xac, 0x48, 0xb1, 0x26,
+    0xce, 0x3c, 0xfe, 0x22, 0x39, 0x79, 0x30, 0xbd, 0x54, 0x16, 0xcd, 0x50, 0x3b, 0x9a, 0xfd, 0xbc, 0xbc, 0xbf, 0x55, 0x9a, 0x94,
+    0x18, 0xe5, 0x6e, 0x70, 0xae, 0x62,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8011[65] = {
+    0x04, 0xa6, 0xaa, 0xac, 0xba, 0x90, 0xce, 0x63, 0x0d, 0x46, 0x05, 0xfb, 0x96, 0x2f, 0x97, 0x41, 0x7d,
+    0x77, 0x6f, 0xbd, 0x4f, 0x73, 0x96, 0x37, 0x9d, 0x10, 0xdc, 0x39, 0xd1, 0x28, 0x5f, 0x43, 0xdb, 0xeb,
+    0x5e, 0xec, 0x1d, 0x0d, 0xec, 0xd1, 0x85, 0xab, 0x38, 0x3d, 0x31, 0x1a, 0x67, 0x62, 0x49, 0xeb, 0xca,
+    0x90, 0x5e, 0xa6, 0x1a, 0x61, 0x47, 0xbe, 0x51, 0xdf, 0x28, 0x05, 0x05, 0xf9, 0x39,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8011[32] = {
+    0xcf, 0x5c, 0x8d, 0x0b, 0x8f, 0x83, 0xd8, 0xae, 0x6a, 0xd6, 0xa4, 0xac, 0x6e, 0x87, 0x73, 0x0b,
+    0x74, 0x32, 0xb7, 0xf5, 0x55, 0x3a, 0x50, 0x4b, 0x56, 0xce, 0x63, 0xaa, 0xf7, 0xe5, 0x31, 0x49,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8011);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8011);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8011);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8012
+const uint8_t kDevelopmentDAC_Cert_FFF2_8012[467] = {
+    0x30, 0x82, 0x01, 0xcf, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x4f, 0x0e, 0x7a, 0x55, 0xc8, 0x0f,
+    0x75, 0x01, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x32, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x32, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x32, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x9e, 0x94, 0x59, 0x77, 0xf2, 0x2d, 0x26, 0x65, 0x90, 0x21, 0xf4,
+    0xd0, 0xa6, 0x34, 0x2b, 0x25, 0x3e, 0x1e, 0xa2, 0xdc, 0xfd, 0xb9, 0x5f, 0x76, 0xc3, 0x24, 0xe7, 0x6e, 0x2c, 0x62, 0xb7, 0x70,
+    0xb4, 0x3b, 0xfe, 0x0f, 0x08, 0x31, 0x82, 0xc6, 0xb2, 0x60, 0xd6, 0xa2, 0x95, 0xeb, 0xe2, 0xf5, 0x1e, 0xe9, 0x08, 0x17, 0xd6,
+    0x6f, 0xea, 0x97, 0xa7, 0x27, 0x0e, 0x1f, 0xb0, 0x77, 0x3a, 0x75, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x5b, 0x40, 0x51, 0xc6, 0x6a, 0xb0, 0xf6,
+    0xce, 0xda, 0x4a, 0x7d, 0xcf, 0x14, 0x36, 0x4f, 0x64, 0x97, 0x21, 0x10, 0x66, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07, 0x37, 0x8f, 0xf0,
+    0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47, 0x00, 0x30, 0x44,
+    0x02, 0x20, 0x41, 0xe6, 0x27, 0x3e, 0xd6, 0x02, 0xaa, 0xc7, 0x9b, 0x7e, 0xc1, 0x81, 0xd5, 0x7b, 0x74, 0x54, 0x72, 0x5d, 0xbb,
+    0xee, 0xbc, 0x0d, 0x68, 0x78, 0xaa, 0xa6, 0x9d, 0x36, 0xbf, 0xc7, 0x82, 0x23, 0x02, 0x20, 0x4e, 0x8c, 0x44, 0x38, 0x22, 0x38,
+    0xa0, 0x3f, 0xc5, 0x97, 0x3b, 0x54, 0xaf, 0x52, 0x5e, 0xf3, 0xdc, 0xab, 0xdb, 0x1d, 0xbf, 0x48, 0xe3, 0x08, 0x04, 0x1f, 0x12,
+    0x02, 0xa3, 0x36, 0x5e, 0xf9,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8012[65] = {
+    0x04, 0x9e, 0x94, 0x59, 0x77, 0xf2, 0x2d, 0x26, 0x65, 0x90, 0x21, 0xf4, 0xd0, 0xa6, 0x34, 0x2b, 0x25,
+    0x3e, 0x1e, 0xa2, 0xdc, 0xfd, 0xb9, 0x5f, 0x76, 0xc3, 0x24, 0xe7, 0x6e, 0x2c, 0x62, 0xb7, 0x70, 0xb4,
+    0x3b, 0xfe, 0x0f, 0x08, 0x31, 0x82, 0xc6, 0xb2, 0x60, 0xd6, 0xa2, 0x95, 0xeb, 0xe2, 0xf5, 0x1e, 0xe9,
+    0x08, 0x17, 0xd6, 0x6f, 0xea, 0x97, 0xa7, 0x27, 0x0e, 0x1f, 0xb0, 0x77, 0x3a, 0x75,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8012[32] = {
+    0x45, 0x92, 0x5c, 0x30, 0xbe, 0xb2, 0xb4, 0x02, 0x1e, 0x2c, 0xc2, 0x00, 0xb2, 0x53, 0xe3, 0xd2,
+    0x26, 0x01, 0xa0, 0x82, 0x00, 0xe8, 0x11, 0x6e, 0x36, 0x37, 0x13, 0x81, 0xb3, 0x35, 0xd5, 0x6a,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8012);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8012);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8012);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8013
+const uint8_t kDevelopmentDAC_Cert_FFF2_8013[467] = {
+    0x30, 0x82, 0x01, 0xcf, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x3d, 0x9f, 0x94, 0xa3, 0x17, 0x05,
+    0xff, 0x29, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x33, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x32, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x33, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xcb, 0x11, 0x03, 0xba, 0x64, 0xe0, 0xe3, 0x1a, 0x96, 0xf8, 0xbc,
+    0x5e, 0xde, 0x37, 0xb6, 0x33, 0xd2, 0xbb, 0x12, 0xe3, 0x5b, 0x4f, 0x01, 0xb9, 0x3c, 0x10, 0x0e, 0x03, 0xe0, 0x75, 0xad, 0x53,
+    0x28, 0x44, 0x1b, 0x75, 0x93, 0xaa, 0x3e, 0x80, 0x3b, 0xf2, 0x87, 0x3c, 0x01, 0x9d, 0xe4, 0x52, 0x51, 0x24, 0x78, 0xe6, 0x0f,
+    0x34, 0x8a, 0xd9, 0x96, 0x00, 0x57, 0xb5, 0x36, 0xca, 0x84, 0x92, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x6b, 0xeb, 0x11, 0xbb, 0xcb, 0x8d, 0x16,
+    0xb3, 0x89, 0x7e, 0x00, 0x42, 0xe0, 0xcb, 0xff, 0x9e, 0x2d, 0xb6, 0x26, 0x50, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07, 0x37, 0x8f, 0xf0,
+    0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47, 0x00, 0x30, 0x44,
+    0x02, 0x20, 0x01, 0x38, 0xed, 0x71, 0x11, 0xa7, 0xde, 0x55, 0xd7, 0x79, 0xa5, 0xb4, 0xe5, 0x87, 0x4b, 0xe7, 0xc5, 0x7b, 0x82,
+    0x1a, 0x1c, 0x36, 0x64, 0x9e, 0x6f, 0xdd, 0x99, 0x97, 0xd3, 0x78, 0xc4, 0xe2, 0x02, 0x20, 0x78, 0x5f, 0xab, 0x3b, 0x3a, 0x77,
+    0x6c, 0xd5, 0x76, 0x71, 0x19, 0x2e, 0x95, 0xcb, 0x6e, 0x31, 0x24, 0x4d, 0xc2, 0xb5, 0x8a, 0xce, 0x7c, 0x83, 0x83, 0x0b, 0x6b,
+    0x86, 0x48, 0xfd, 0x90, 0x21,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8013[65] = {
+    0x04, 0xcb, 0x11, 0x03, 0xba, 0x64, 0xe0, 0xe3, 0x1a, 0x96, 0xf8, 0xbc, 0x5e, 0xde, 0x37, 0xb6, 0x33,
+    0xd2, 0xbb, 0x12, 0xe3, 0x5b, 0x4f, 0x01, 0xb9, 0x3c, 0x10, 0x0e, 0x03, 0xe0, 0x75, 0xad, 0x53, 0x28,
+    0x44, 0x1b, 0x75, 0x93, 0xaa, 0x3e, 0x80, 0x3b, 0xf2, 0x87, 0x3c, 0x01, 0x9d, 0xe4, 0x52, 0x51, 0x24,
+    0x78, 0xe6, 0x0f, 0x34, 0x8a, 0xd9, 0x96, 0x00, 0x57, 0xb5, 0x36, 0xca, 0x84, 0x92,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8013[32] = {
+    0x64, 0x01, 0xf6, 0xfa, 0x76, 0xed, 0xe8, 0xfc, 0x96, 0x09, 0x06, 0xba, 0xcb, 0xd2, 0x18, 0x67,
+    0xbc, 0xe1, 0xf6, 0x91, 0x84, 0xfb, 0xda, 0x99, 0x4f, 0xa5, 0x98, 0x51, 0x5a, 0xc3, 0x28, 0x89,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8013);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8013);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8013);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8014
+const uint8_t kDevelopmentDAC_Cert_FFF2_8014[468] = {
+    0x30, 0x82, 0x01, 0xd0, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x46, 0xa8, 0x4c, 0xe2, 0xbf, 0x06,
+    0x8a, 0xa0, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x34, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x32, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x34, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xe2, 0x60, 0x4e, 0xec, 0x8f, 0x54, 0x1d, 0xaf, 0x80, 0x62, 0xc3,
+    0x71, 0xc4, 0x8c, 0x0f, 0xbb, 0x91, 0xc8, 0x7d, 0x7d, 0xb0, 0x4f, 0x2f, 0x64, 0x9a, 0x01, 0x8d, 0xd4, 0x61, 0xd3, 0xf3, 0xf3,
+    0x89, 0x95, 0xdd, 0x2f, 0x0b, 0x21, 0x57, 0xcb, 0x7f, 0xb6, 0x73, 0xc1, 0xd3, 0xd7, 0xee, 0xe2, 0x5b, 0x31, 0xf9, 0xec, 0x9e,
+    0x3d, 0xc2, 0x16, 0x51, 0xdc, 0x06, 0x6a, 0xad, 0x2b, 0xcb, 0x12, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x66, 0xb1, 0xdb, 0x13, 0x87, 0xf9, 0xc9,
+    0x02, 0x22, 0xd8, 0x73, 0xa5, 0x07, 0x36, 0xe3, 0x46, 0xe0, 0x1f, 0x07, 0x34, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07, 0x37, 0x8f, 0xf0,
+    0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45,
+    0x02, 0x21, 0x00, 0xc9, 0x2a, 0x13, 0xb8, 0x76, 0x45, 0x00, 0x98, 0x33, 0xd2, 0x57, 0x6c, 0x74, 0xbd, 0x41, 0x39, 0x85, 0x87,
+    0x5c, 0x85, 0xbd, 0x3d, 0xbc, 0xad, 0x2c, 0x66, 0x02, 0xa1, 0x57, 0x70, 0x28, 0x93, 0x02, 0x20, 0x0f, 0x84, 0xac, 0x62, 0x3f,
+    0xf8, 0xaa, 0x9e, 0xda, 0x3b, 0x02, 0xb7, 0x43, 0x5c, 0xb6, 0x52, 0x59, 0xdc, 0x74, 0x66, 0x57, 0x71, 0xe2, 0x01, 0x8e, 0x36,
+    0x6b, 0xac, 0x72, 0x4c, 0x15, 0x2d,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8014[65] = {
+    0x04, 0xe2, 0x60, 0x4e, 0xec, 0x8f, 0x54, 0x1d, 0xaf, 0x80, 0x62, 0xc3, 0x71, 0xc4, 0x8c, 0x0f, 0xbb,
+    0x91, 0xc8, 0x7d, 0x7d, 0xb0, 0x4f, 0x2f, 0x64, 0x9a, 0x01, 0x8d, 0xd4, 0x61, 0xd3, 0xf3, 0xf3, 0x89,
+    0x95, 0xdd, 0x2f, 0x0b, 0x21, 0x57, 0xcb, 0x7f, 0xb6, 0x73, 0xc1, 0xd3, 0xd7, 0xee, 0xe2, 0x5b, 0x31,
+    0xf9, 0xec, 0x9e, 0x3d, 0xc2, 0x16, 0x51, 0xdc, 0x06, 0x6a, 0xad, 0x2b, 0xcb, 0x12,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8014[32] = {
+    0x9c, 0x97, 0xb6, 0x23, 0x03, 0x62, 0xb6, 0x21, 0xad, 0x06, 0xa9, 0x21, 0x5f, 0x10, 0x1d, 0x07,
+    0x5a, 0x95, 0xea, 0x5a, 0xba, 0xcd, 0xd8, 0xf5, 0xf3, 0x19, 0x10, 0x45, 0x2d, 0x86, 0x4e, 0xd9,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8014);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8014);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8014);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8015
+const uint8_t kDevelopmentDAC_Cert_FFF2_8015[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x1a, 0xfa, 0x53, 0xd1, 0xa2, 0x7c,
+    0x5e, 0xb5, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x35, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x35, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x8a, 0xd3, 0xf5, 0x2d, 0xf5, 0x94, 0xb8, 0x87,
+    0xc3, 0xfb, 0xcc, 0x0e, 0x76, 0x9d, 0xbb, 0x51, 0x59, 0x00, 0x66, 0xfe, 0xe3, 0x6a, 0x76, 0xd3, 0xdf, 0x3e, 0x5f, 0xb1, 0xde,
+    0xea, 0x22, 0x3a, 0x0d, 0x9c, 0xc7, 0x49, 0xb8, 0x9c, 0x66, 0x38, 0xe9, 0x30, 0x7e, 0x62, 0x0d, 0x66, 0x24, 0x28, 0xde, 0xd2,
+    0x8d, 0xa1, 0x0b, 0x0c, 0x4a, 0xde, 0x28, 0x4e, 0xfc, 0x30, 0xfe, 0x4e, 0xe9, 0x20, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xc5, 0x17, 0x1b, 0xe0,
+    0x28, 0x86, 0xa7, 0x38, 0x32, 0xc4, 0x58, 0xd5, 0x11, 0x29, 0xb6, 0xdf, 0xf9, 0xde, 0x6e, 0x3a, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xde, 0x0b, 0xb9, 0xa9, 0x50, 0x48, 0x83, 0xe8, 0x67, 0x40, 0xbf, 0xb3, 0xea, 0xb2, 0x7d,
+    0x83, 0x79, 0x4e, 0x25, 0x14, 0x00, 0x1a, 0xfd, 0x8e, 0x52, 0xa7, 0xad, 0x4d, 0x1c, 0xda, 0xd0, 0xc2, 0x02, 0x21, 0x00, 0x8c,
+    0x58, 0x33, 0x91, 0x67, 0x9b, 0x59, 0xe9, 0xa9, 0xe6, 0x5b, 0x4f, 0xb7, 0xd5, 0x0e, 0x3f, 0xcb, 0x5d, 0x1e, 0xa5, 0x3b, 0xde,
+    0xea, 0x4a, 0xc5, 0x47, 0x23, 0xe2, 0x03, 0x2f, 0xbc, 0x25,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8015[65] = {
+    0x04, 0x8a, 0xd3, 0xf5, 0x2d, 0xf5, 0x94, 0xb8, 0x87, 0xc3, 0xfb, 0xcc, 0x0e, 0x76, 0x9d, 0xbb, 0x51,
+    0x59, 0x00, 0x66, 0xfe, 0xe3, 0x6a, 0x76, 0xd3, 0xdf, 0x3e, 0x5f, 0xb1, 0xde, 0xea, 0x22, 0x3a, 0x0d,
+    0x9c, 0xc7, 0x49, 0xb8, 0x9c, 0x66, 0x38, 0xe9, 0x30, 0x7e, 0x62, 0x0d, 0x66, 0x24, 0x28, 0xde, 0xd2,
+    0x8d, 0xa1, 0x0b, 0x0c, 0x4a, 0xde, 0x28, 0x4e, 0xfc, 0x30, 0xfe, 0x4e, 0xe9, 0x20,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8015[32] = {
+    0x25, 0x81, 0x32, 0xa7, 0x32, 0x17, 0x6b, 0x40, 0x70, 0x75, 0x79, 0x40, 0xdf, 0xb5, 0xa6, 0x01,
+    0xff, 0xb0, 0xd7, 0x30, 0x27, 0xc5, 0xf2, 0xde, 0xe7, 0x52, 0x62, 0xe6, 0xe1, 0x04, 0x69, 0x77,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8015);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8015);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8015);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8016
+const uint8_t kDevelopmentDAC_Cert_FFF2_8016[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x1c, 0x11, 0x97, 0xbc, 0x3d, 0x59,
+    0xa7, 0x12, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x36, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x36, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x3a, 0xa2, 0x2f, 0xe4, 0x69, 0xf8, 0x01, 0x1f,
+    0xb8, 0xd1, 0x1c, 0x94, 0xae, 0xc7, 0xcc, 0xcb, 0xe1, 0x91, 0x13, 0x9b, 0x5d, 0xb1, 0x66, 0x78, 0x44, 0x82, 0x2f, 0x7e, 0x9b,
+    0x7e, 0xde, 0xf9, 0x3b, 0x3a, 0xb1, 0x61, 0x37, 0xf6, 0xa5, 0xa5, 0xdb, 0x9a, 0xd2, 0x62, 0xd7, 0x98, 0x33, 0xb6, 0x73, 0x58,
+    0x7b, 0xff, 0x2b, 0x0f, 0x2e, 0xe0, 0x9e, 0x1f, 0x75, 0xb7, 0xcc, 0x44, 0x0a, 0x80, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x21, 0xe6, 0xe2, 0xb1,
+    0x79, 0x44, 0xb9, 0xda, 0xfb, 0x38, 0x1d, 0x2b, 0x93, 0xfe, 0x9d, 0xa0, 0x02, 0x4f, 0xde, 0x4e, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x6b, 0x8c, 0xe1, 0xde, 0xe7, 0xd0, 0xe9, 0xc6, 0x22, 0x1c, 0x1d, 0x57, 0x55, 0x9c, 0x9e, 0xfb,
+    0x40, 0x0f, 0x37, 0x56, 0x75, 0x5f, 0xd9, 0xaa, 0xd2, 0x93, 0xf5, 0x18, 0xfa, 0xa7, 0xa5, 0xd3, 0x02, 0x21, 0x00, 0xc9, 0x89,
+    0xa4, 0xf0, 0x6b, 0xfe, 0xdf, 0x9a, 0x26, 0xd7, 0x80, 0x62, 0x91, 0x1a, 0x83, 0x49, 0xff, 0x79, 0x0b, 0x6b, 0xe0, 0x1a, 0xa6,
+    0xb3, 0x95, 0x16, 0x9e, 0x78, 0xa3, 0xe5, 0x19, 0x48,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8016[65] = {
+    0x04, 0x3a, 0xa2, 0x2f, 0xe4, 0x69, 0xf8, 0x01, 0x1f, 0xb8, 0xd1, 0x1c, 0x94, 0xae, 0xc7, 0xcc, 0xcb,
+    0xe1, 0x91, 0x13, 0x9b, 0x5d, 0xb1, 0x66, 0x78, 0x44, 0x82, 0x2f, 0x7e, 0x9b, 0x7e, 0xde, 0xf9, 0x3b,
+    0x3a, 0xb1, 0x61, 0x37, 0xf6, 0xa5, 0xa5, 0xdb, 0x9a, 0xd2, 0x62, 0xd7, 0x98, 0x33, 0xb6, 0x73, 0x58,
+    0x7b, 0xff, 0x2b, 0x0f, 0x2e, 0xe0, 0x9e, 0x1f, 0x75, 0xb7, 0xcc, 0x44, 0x0a, 0x80,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8016[32] = {
+    0x29, 0xdc, 0x3b, 0x83, 0x67, 0x48, 0x98, 0x5f, 0xd7, 0x00, 0x9d, 0x07, 0xd6, 0x62, 0x37, 0x5e,
+    0xc8, 0x5c, 0x72, 0xff, 0x95, 0xfd, 0xbe, 0x60, 0x64, 0x81, 0x6f, 0x2b, 0x70, 0x3a, 0xe0, 0xc4,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8016);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8016);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8016);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8017
+const uint8_t kDevelopmentDAC_Cert_FFF2_8017[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x4b, 0x02, 0x35, 0xca, 0xbe, 0xc5,
+    0xf5, 0x0a, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x37, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x37, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x96, 0xf0, 0xeb, 0x64, 0xa4, 0xf0, 0x39, 0x52,
+    0x0d, 0xd3, 0x72, 0xe9, 0xb2, 0xd0, 0xca, 0x1a, 0x8d, 0x12, 0x0d, 0xdd, 0x3d, 0xbe, 0x40, 0x4b, 0x26, 0xe8, 0x5d, 0xe9, 0x48,
+    0x4c, 0xc4, 0xf4, 0xfb, 0x56, 0x21, 0x5f, 0x5b, 0xf5, 0x4b, 0x72, 0x23, 0xbc, 0xde, 0x64, 0xca, 0xc1, 0x09, 0x9a, 0x3c, 0x5f,
+    0xd0, 0x1e, 0xc2, 0xaf, 0x84, 0xf9, 0x5d, 0x7c, 0xe0, 0xc6, 0x3b, 0x24, 0x5e, 0x48, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xb6, 0x2b, 0x6e, 0x8b,
+    0x0d, 0xe3, 0x47, 0xae, 0x4a, 0xe6, 0xd8, 0x52, 0x42, 0x33, 0x38, 0x1c, 0x9c, 0x11, 0xa0, 0xdd, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xd0, 0x34, 0x35, 0x8a, 0xb6, 0x2d, 0xf8, 0xe2, 0xbf, 0xd4, 0xfb, 0x54, 0xd4, 0xf8, 0x2b,
+    0x89, 0x84, 0x52, 0xef, 0x05, 0x8d, 0x2d, 0x90, 0x0e, 0xa7, 0xba, 0x10, 0x15, 0x96, 0x13, 0x9f, 0x9a, 0x02, 0x20, 0x2b, 0x80,
+    0x4e, 0xf3, 0xc4, 0x90, 0xcb, 0x93, 0xc5, 0xec, 0x2f, 0x7d, 0x65, 0xa6, 0x57, 0x2c, 0xb5, 0x6a, 0x92, 0x91, 0xfc, 0x82, 0xda,
+    0x23, 0x0a, 0xe5, 0x47, 0xa5, 0x94, 0x69, 0xc2, 0x04,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8017[65] = {
+    0x04, 0x96, 0xf0, 0xeb, 0x64, 0xa4, 0xf0, 0x39, 0x52, 0x0d, 0xd3, 0x72, 0xe9, 0xb2, 0xd0, 0xca, 0x1a,
+    0x8d, 0x12, 0x0d, 0xdd, 0x3d, 0xbe, 0x40, 0x4b, 0x26, 0xe8, 0x5d, 0xe9, 0x48, 0x4c, 0xc4, 0xf4, 0xfb,
+    0x56, 0x21, 0x5f, 0x5b, 0xf5, 0x4b, 0x72, 0x23, 0xbc, 0xde, 0x64, 0xca, 0xc1, 0x09, 0x9a, 0x3c, 0x5f,
+    0xd0, 0x1e, 0xc2, 0xaf, 0x84, 0xf9, 0x5d, 0x7c, 0xe0, 0xc6, 0x3b, 0x24, 0x5e, 0x48,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8017[32] = {
+    0x0b, 0xc7, 0xd4, 0x0b, 0x37, 0x52, 0x18, 0x1d, 0x93, 0x85, 0xfc, 0x17, 0x03, 0x39, 0x56, 0x0e,
+    0xd9, 0x88, 0x5b, 0x45, 0x3e, 0x41, 0x40, 0xcf, 0x76, 0xe3, 0x1d, 0x05, 0xa0, 0x3e, 0x5c, 0x21,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8017);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8017);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8017);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8018
+const uint8_t kDevelopmentDAC_Cert_FFF2_8018[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x06, 0x5c, 0xf2, 0xa6, 0x1b, 0x46,
+    0xe3, 0x5e, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x38, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x38, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x2e, 0x1b, 0x4f, 0xa4, 0x84, 0x31, 0x83, 0x25,
+    0x4a, 0xa5, 0x34, 0xc6, 0xe4, 0xf6, 0x42, 0xf2, 0xec, 0x82, 0xbd, 0xd7, 0xe6, 0xb2, 0x8b, 0xb4, 0x50, 0x6e, 0xc8, 0xee, 0xa6,
+    0xb5, 0xb5, 0x63, 0x6a, 0x51, 0x82, 0x23, 0xc0, 0x72, 0x82, 0x38, 0x7c, 0x34, 0xd5, 0x03, 0x03, 0xac, 0xbb, 0xbf, 0xd0, 0xec,
+    0x4e, 0x90, 0x84, 0xdc, 0x3f, 0xf6, 0x15, 0xab, 0x64, 0xd3, 0x1c, 0x90, 0xb3, 0xf2, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x46, 0xab, 0x26, 0xde,
+    0x4a, 0x0c, 0xd5, 0x2d, 0x76, 0x70, 0x07, 0xad, 0x10, 0x1b, 0xc5, 0xf0, 0x39, 0xe8, 0xd8, 0xf2, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x3a, 0x44, 0x2f, 0x8a, 0x89, 0x95, 0xc7, 0x1c, 0x1f, 0x4a, 0x49, 0x6d, 0x2f, 0xb2, 0xf4, 0x75,
+    0xb8, 0xf5, 0xab, 0xcb, 0x76, 0xd3, 0x8e, 0x8d, 0x7c, 0x40, 0x16, 0xc1, 0x86, 0xaa, 0xf6, 0x98, 0x02, 0x21, 0x00, 0xa3, 0x54,
+    0xdc, 0xbf, 0xea, 0x2c, 0x8f, 0xa3, 0x96, 0xf7, 0xfb, 0x70, 0xfb, 0x30, 0xc9, 0x05, 0x54, 0xc4, 0xaa, 0x0d, 0x17, 0x34, 0x18,
+    0x71, 0x90, 0x28, 0x31, 0x32, 0xff, 0xd6, 0x8f, 0x4f,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8018[65] = {
+    0x04, 0x2e, 0x1b, 0x4f, 0xa4, 0x84, 0x31, 0x83, 0x25, 0x4a, 0xa5, 0x34, 0xc6, 0xe4, 0xf6, 0x42, 0xf2,
+    0xec, 0x82, 0xbd, 0xd7, 0xe6, 0xb2, 0x8b, 0xb4, 0x50, 0x6e, 0xc8, 0xee, 0xa6, 0xb5, 0xb5, 0x63, 0x6a,
+    0x51, 0x82, 0x23, 0xc0, 0x72, 0x82, 0x38, 0x7c, 0x34, 0xd5, 0x03, 0x03, 0xac, 0xbb, 0xbf, 0xd0, 0xec,
+    0x4e, 0x90, 0x84, 0xdc, 0x3f, 0xf6, 0x15, 0xab, 0x64, 0xd3, 0x1c, 0x90, 0xb3, 0xf2,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8018[32] = {
+    0xb3, 0xd2, 0xb5, 0x2d, 0x8a, 0x0c, 0x7c, 0xad, 0x32, 0x0c, 0xef, 0x91, 0x24, 0x4b, 0x2c, 0xbf,
+    0xfe, 0x28, 0x68, 0xdd, 0x87, 0x86, 0xbd, 0x4e, 0xa4, 0x74, 0xbf, 0x2a, 0x1f, 0x78, 0xff, 0xbc,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8018);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8018);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8018);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8019
+const uint8_t kDevelopmentDAC_Cert_FFF2_8019[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x7d, 0xf7, 0xec, 0x3e, 0xbb, 0x0f,
+    0x52, 0x73, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x39, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x39, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x53, 0xaf, 0x09, 0xcc, 0xd0, 0xe6, 0x0e, 0x83,
+    0xcc, 0x89, 0xaa, 0x64, 0xff, 0xfc, 0x50, 0x5f, 0x5f, 0xc6, 0x7b, 0x6d, 0xbb, 0xcb, 0x42, 0xb4, 0x12, 0x04, 0x24, 0x20, 0x20,
+    0xfd, 0x6a, 0x21, 0xf0, 0x85, 0xa1, 0x88, 0x48, 0x37, 0xa8, 0x4a, 0x39, 0xf8, 0xe3, 0x5a, 0xb7, 0xba, 0x33, 0xc1, 0x73, 0xca,
+    0xd8, 0x5e, 0x8b, 0x8d, 0x58, 0x4b, 0xd5, 0x81, 0xdc, 0xb5, 0x8a, 0x4d, 0x27, 0xda, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x66, 0x91, 0x96, 0xde,
+    0x15, 0x9d, 0x96, 0x71, 0x3f, 0x2b, 0xb8, 0xe4, 0x19, 0x9b, 0x80, 0x48, 0x40, 0x2a, 0x1e, 0x9e, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0x8a, 0xd7, 0xf5, 0x64, 0x25, 0x83, 0xdc, 0x6d, 0x93, 0xac, 0xae, 0x62, 0x56, 0x59, 0x4c,
+    0x24, 0xd4, 0x8e, 0xa6, 0x90, 0x42, 0x25, 0x60, 0x1e, 0xd1, 0x60, 0x07, 0x9b, 0x1a, 0xf3, 0x82, 0xda, 0x02, 0x20, 0x3b, 0x3e,
+    0x90, 0x23, 0x54, 0x85, 0xe5, 0xf5, 0x16, 0xab, 0xb7, 0x02, 0xfd, 0x0e, 0x39, 0x5a, 0x31, 0x68, 0x17, 0x82, 0xf5, 0xb0, 0x91,
+    0xc7, 0x19, 0xf5, 0x1c, 0x1d, 0x76, 0x75, 0x1b, 0xcb,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_8019[65] = {
+    0x04, 0x53, 0xaf, 0x09, 0xcc, 0xd0, 0xe6, 0x0e, 0x83, 0xcc, 0x89, 0xaa, 0x64, 0xff, 0xfc, 0x50, 0x5f,
+    0x5f, 0xc6, 0x7b, 0x6d, 0xbb, 0xcb, 0x42, 0xb4, 0x12, 0x04, 0x24, 0x20, 0x20, 0xfd, 0x6a, 0x21, 0xf0,
+    0x85, 0xa1, 0x88, 0x48, 0x37, 0xa8, 0x4a, 0x39, 0xf8, 0xe3, 0x5a, 0xb7, 0xba, 0x33, 0xc1, 0x73, 0xca,
+    0xd8, 0x5e, 0x8b, 0x8d, 0x58, 0x4b, 0xd5, 0x81, 0xdc, 0xb5, 0x8a, 0x4d, 0x27, 0xda,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8019[32] = {
+    0x65, 0x99, 0x1d, 0x94, 0xe7, 0x78, 0x09, 0x54, 0xcb, 0xf0, 0x37, 0xee, 0x49, 0xca, 0x37, 0xff,
+    0xbd, 0x6c, 0x5e, 0x34, 0xa5, 0x12, 0xa7, 0xae, 0x78, 0xee, 0x97, 0x4e, 0xdc, 0x53, 0x10, 0xda,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_8019);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_8019);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_8019);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801A
+const uint8_t kDevelopmentDAC_Cert_FFF2_801A[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x45, 0x7b, 0xca, 0x88, 0x95, 0x25,
+    0xbc, 0xb4, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x41, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x41, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xd7, 0xb3, 0x8c, 0xea, 0x97, 0x37, 0x30, 0x8c,
+    0x13, 0x28, 0x24, 0xfb, 0x45, 0x4a, 0x64, 0x95, 0x77, 0x0a, 0xa9, 0x3b, 0xa1, 0x91, 0x28, 0xd8, 0xe1, 0xea, 0x0a, 0xcf, 0xd3,
+    0xcd, 0xf8, 0x65, 0x03, 0x85, 0x49, 0xcd, 0x39, 0x8d, 0xdf, 0xea, 0x18, 0xc0, 0xa3, 0x4a, 0x85, 0xd7, 0x63, 0xa7, 0x2c, 0xf5,
+    0xc4, 0xba, 0x62, 0x10, 0xb4, 0x00, 0x44, 0xdb, 0x04, 0xbf, 0x57, 0x74, 0x2d, 0x79, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x5c, 0x70, 0xcf, 0x06,
+    0xff, 0x56, 0x76, 0x0e, 0x82, 0x5c, 0x89, 0xd8, 0xdb, 0xe0, 0x4b, 0x90, 0x7c, 0x1f, 0xdd, 0x66, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x3d, 0xad, 0x48, 0x13, 0x45, 0x64, 0x50, 0x40, 0x48, 0x97, 0x70, 0xe0, 0x52, 0x7d, 0x1b, 0xe3,
+    0x87, 0x80, 0x0d, 0x81, 0xee, 0xa8, 0x8e, 0x50, 0xbf, 0x1e, 0xc9, 0x91, 0x25, 0x3a, 0x68, 0x71, 0x02, 0x21, 0x00, 0xfd, 0x19,
+    0x68, 0x9f, 0xe3, 0x3f, 0x1f, 0x99, 0x27, 0x41, 0xb5, 0x1c, 0x30, 0xed, 0x0f, 0x7c, 0x83, 0x59, 0x36, 0x81, 0x4a, 0x81, 0xec,
+    0x35, 0x5f, 0x82, 0xd7, 0x2d, 0x03, 0xa4, 0x83, 0xc1,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_801A[65] = {
+    0x04, 0xd7, 0xb3, 0x8c, 0xea, 0x97, 0x37, 0x30, 0x8c, 0x13, 0x28, 0x24, 0xfb, 0x45, 0x4a, 0x64, 0x95,
+    0x77, 0x0a, 0xa9, 0x3b, 0xa1, 0x91, 0x28, 0xd8, 0xe1, 0xea, 0x0a, 0xcf, 0xd3, 0xcd, 0xf8, 0x65, 0x03,
+    0x85, 0x49, 0xcd, 0x39, 0x8d, 0xdf, 0xea, 0x18, 0xc0, 0xa3, 0x4a, 0x85, 0xd7, 0x63, 0xa7, 0x2c, 0xf5,
+    0xc4, 0xba, 0x62, 0x10, 0xb4, 0x00, 0x44, 0xdb, 0x04, 0xbf, 0x57, 0x74, 0x2d, 0x79,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801A[32] = {
+    0x9f, 0x7f, 0x35, 0x06, 0x1a, 0xb3, 0xd8, 0x78, 0x63, 0xe2, 0xbf, 0x0b, 0x85, 0x74, 0xba, 0x6c,
+    0xcc, 0x4c, 0x2e, 0x4f, 0x37, 0x81, 0xce, 0x83, 0xd6, 0xe6, 0xfd, 0xb1, 0xd6, 0x44, 0xb6, 0xce,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_801A);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_801A);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_801A);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801B
+const uint8_t kDevelopmentDAC_Cert_FFF2_801B[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x65, 0xc6, 0x34, 0x9f, 0x73, 0xc6,
+    0xa7, 0x7f, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x42, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x42, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xe9, 0x93, 0xab, 0x75, 0x2d, 0xfc, 0xb2, 0xff,
+    0x7d, 0x88, 0xc5, 0xc2, 0x44, 0xd2, 0x4c, 0x27, 0xd7, 0xfe, 0xe1, 0x04, 0x35, 0x49, 0xc2, 0xe1, 0xed, 0x88, 0x7f, 0xef, 0xf3,
+    0x71, 0xad, 0xe5, 0x58, 0x70, 0xf4, 0x04, 0x85, 0x69, 0xa9, 0xcf, 0x00, 0xf7, 0xc1, 0xf3, 0x78, 0x82, 0x7c, 0x5c, 0x05, 0xdb,
+    0xb2, 0x79, 0x6f, 0x99, 0x3f, 0x36, 0x7f, 0xd1, 0xc0, 0x0e, 0x89, 0x72, 0xc0, 0xdb, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x31, 0x4d, 0x5d, 0x32,
+    0x3a, 0x84, 0xca, 0x5e, 0xcf, 0x92, 0xc6, 0xbe, 0x81, 0xad, 0xee, 0x83, 0x2a, 0x46, 0xdf, 0x6a, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x56, 0x2c, 0x8c, 0x8d, 0xd5, 0x3d, 0x1a, 0xd7, 0xbe, 0xd4, 0xd4, 0xbc, 0x6c, 0xc9, 0x79, 0xab,
+    0x2c, 0x2b, 0xee, 0x9c, 0x50, 0x20, 0x69, 0x3f, 0x1e, 0xe3, 0x86, 0xc6, 0x44, 0x70, 0xff, 0xa8, 0x02, 0x21, 0x00, 0x9b, 0x3a,
+    0xc8, 0xa5, 0xc2, 0x64, 0xa4, 0x47, 0x07, 0x92, 0x55, 0x1a, 0x60, 0x42, 0xf9, 0x50, 0x60, 0xc9, 0x48, 0xd6, 0xb4, 0x38, 0x91,
+    0xd2, 0x04, 0xf1, 0xf1, 0xe5, 0xda, 0x53, 0x78, 0xe2,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_801B[65] = {
+    0x04, 0xe9, 0x93, 0xab, 0x75, 0x2d, 0xfc, 0xb2, 0xff, 0x7d, 0x88, 0xc5, 0xc2, 0x44, 0xd2, 0x4c, 0x27,
+    0xd7, 0xfe, 0xe1, 0x04, 0x35, 0x49, 0xc2, 0xe1, 0xed, 0x88, 0x7f, 0xef, 0xf3, 0x71, 0xad, 0xe5, 0x58,
+    0x70, 0xf4, 0x04, 0x85, 0x69, 0xa9, 0xcf, 0x00, 0xf7, 0xc1, 0xf3, 0x78, 0x82, 0x7c, 0x5c, 0x05, 0xdb,
+    0xb2, 0x79, 0x6f, 0x99, 0x3f, 0x36, 0x7f, 0xd1, 0xc0, 0x0e, 0x89, 0x72, 0xc0, 0xdb,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801B[32] = {
+    0xc7, 0xcc, 0x83, 0x64, 0xac, 0x2b, 0x80, 0x38, 0x3b, 0xdd, 0x71, 0xc6, 0xc6, 0x20, 0x64, 0x77,
+    0x8b, 0xa2, 0xc3, 0xb7, 0x52, 0xe1, 0x41, 0x6e, 0x2f, 0xba, 0x60, 0x62, 0xc5, 0x30, 0x66, 0xaf,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_801B);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_801B);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_801B);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801C
+const uint8_t kDevelopmentDAC_Cert_FFF2_801C[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x4c, 0x3b, 0x3c, 0xfc, 0xe6, 0x60,
+    0xa5, 0xe3, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x43, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x43, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x8c, 0x81, 0x52, 0x7c, 0x4b, 0x09, 0xc9, 0x47,
+    0xbd, 0x5a, 0x76, 0xc7, 0x4b, 0xbe, 0xba, 0x1a, 0x92, 0xaf, 0x08, 0xb1, 0x5e, 0x87, 0xf8, 0xc5, 0x00, 0x41, 0x97, 0x7f, 0x51,
+    0x0f, 0x70, 0x05, 0x4b, 0xc5, 0x62, 0xbd, 0x48, 0x34, 0xd3, 0xf2, 0xd3, 0xd0, 0x4a, 0xae, 0x4f, 0xe8, 0xb9, 0x23, 0x33, 0xcb,
+    0xc4, 0xca, 0x9c, 0x3a, 0x95, 0x71, 0xd7, 0x00, 0xc7, 0xdc, 0x5c, 0x8a, 0x6c, 0x23, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x46, 0x2c, 0x5d, 0x48,
+    0x8b, 0xa4, 0x68, 0x24, 0xcd, 0x47, 0x68, 0xba, 0x82, 0x77, 0x00, 0xab, 0xca, 0x06, 0x70, 0x1b, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xac, 0x5e, 0xec, 0x0e, 0x18, 0xbb, 0xe7, 0xb9, 0x9d, 0x1c, 0x24, 0x61, 0xa5, 0xb9, 0x6b,
+    0x7b, 0x24, 0x6e, 0x15, 0xbf, 0xd6, 0x91, 0xe0, 0xad, 0xaf, 0xa0, 0x3b, 0x37, 0x45, 0x1f, 0x58, 0x89, 0x02, 0x21, 0x00, 0xb2,
+    0xa3, 0x2f, 0xbb, 0x69, 0xcb, 0x1a, 0xb0, 0x67, 0x9e, 0x7e, 0x51, 0x9b, 0x9e, 0x59, 0x70, 0x61, 0xc6, 0x34, 0x2d, 0x72, 0xc9,
+    0xcd, 0xc9, 0xc3, 0xf4, 0x89, 0xbb, 0xd6, 0xef, 0x67, 0x77,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_801C[65] = {
+    0x04, 0x8c, 0x81, 0x52, 0x7c, 0x4b, 0x09, 0xc9, 0x47, 0xbd, 0x5a, 0x76, 0xc7, 0x4b, 0xbe, 0xba, 0x1a,
+    0x92, 0xaf, 0x08, 0xb1, 0x5e, 0x87, 0xf8, 0xc5, 0x00, 0x41, 0x97, 0x7f, 0x51, 0x0f, 0x70, 0x05, 0x4b,
+    0xc5, 0x62, 0xbd, 0x48, 0x34, 0xd3, 0xf2, 0xd3, 0xd0, 0x4a, 0xae, 0x4f, 0xe8, 0xb9, 0x23, 0x33, 0xcb,
+    0xc4, 0xca, 0x9c, 0x3a, 0x95, 0x71, 0xd7, 0x00, 0xc7, 0xdc, 0x5c, 0x8a, 0x6c, 0x23,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801C[32] = {
+    0xb8, 0x5a, 0x6a, 0x37, 0x02, 0x52, 0xc5, 0x57, 0xe6, 0x62, 0x9c, 0x8a, 0xf2, 0xf2, 0xa4, 0xea,
+    0x3b, 0xbc, 0x48, 0x8c, 0x68, 0xc1, 0xbc, 0x8d, 0x73, 0x13, 0x7f, 0x6f, 0xb5, 0xcd, 0x3c, 0x9b,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_801C);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_801C);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_801C);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801D
+const uint8_t kDevelopmentDAC_Cert_FFF2_801D[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x6b, 0x11, 0xc5, 0xa9, 0x97, 0xe0,
+    0x93, 0x75, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x44, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xd8, 0xe1, 0x23, 0x5e, 0x6e, 0x37, 0xe2, 0xde,
+    0x10, 0xfc, 0x79, 0x27, 0xf6, 0x95, 0x71, 0x4b, 0xed, 0xd2, 0x3b, 0x1f, 0xb9, 0x8d, 0x3a, 0x64, 0x6d, 0xd8, 0x4f, 0xcf, 0x11,
+    0x12, 0x6b, 0x35, 0xc1, 0xa4, 0x42, 0xe7, 0xcf, 0xd8, 0x71, 0xb1, 0x94, 0x0f, 0x25, 0x28, 0xf6, 0x4a, 0x0c, 0x5a, 0xf7, 0x6c,
+    0xf1, 0x52, 0xdc, 0xc8, 0x68, 0x25, 0x14, 0xeb, 0xb2, 0x0a, 0x4f, 0x49, 0x25, 0x00, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xf3, 0x61, 0xd7, 0x9f,
+    0xce, 0x99, 0xa2, 0xe1, 0x44, 0x58, 0x34, 0x70, 0x7b, 0xfa, 0xcc, 0x01, 0x10, 0x0d, 0x87, 0xc1, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xb4, 0x30, 0x73, 0x49, 0x03, 0xee, 0x8f, 0xf4, 0x8b, 0xc5, 0x7f, 0x27, 0xae, 0x1c, 0x0c,
+    0x86, 0xf7, 0x1e, 0xd8, 0x29, 0x8e, 0x30, 0xc8, 0xf1, 0xd3, 0xc5, 0x68, 0xe1, 0xd2, 0x34, 0x75, 0x1e, 0x02, 0x20, 0x40, 0x49,
+    0x0d, 0xe4, 0xe8, 0x9d, 0xa1, 0xed, 0xe2, 0xec, 0x54, 0x29, 0x67, 0xeb, 0xbd, 0x3d, 0xb6, 0x90, 0x32, 0x31, 0x5b, 0x54, 0xc2,
+    0xe2, 0xc3, 0x70, 0x5c, 0x87, 0xab, 0x0b, 0x5d, 0x5f,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_801D[65] = {
+    0x04, 0xd8, 0xe1, 0x23, 0x5e, 0x6e, 0x37, 0xe2, 0xde, 0x10, 0xfc, 0x79, 0x27, 0xf6, 0x95, 0x71, 0x4b,
+    0xed, 0xd2, 0x3b, 0x1f, 0xb9, 0x8d, 0x3a, 0x64, 0x6d, 0xd8, 0x4f, 0xcf, 0x11, 0x12, 0x6b, 0x35, 0xc1,
+    0xa4, 0x42, 0xe7, 0xcf, 0xd8, 0x71, 0xb1, 0x94, 0x0f, 0x25, 0x28, 0xf6, 0x4a, 0x0c, 0x5a, 0xf7, 0x6c,
+    0xf1, 0x52, 0xdc, 0xc8, 0x68, 0x25, 0x14, 0xeb, 0xb2, 0x0a, 0x4f, 0x49, 0x25, 0x00,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801D[32] = {
+    0x87, 0xc5, 0x65, 0x55, 0x7d, 0xaa, 0x33, 0xc4, 0x16, 0xd8, 0x53, 0xdb, 0xe1, 0x14, 0x66, 0xa4,
+    0x01, 0x5a, 0x8c, 0x1c, 0x7a, 0xd5, 0xfd, 0x74, 0x9c, 0xf4, 0x12, 0x33, 0x81, 0xc0, 0x85, 0x24,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_801D);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_801D);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_801D);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801E
+const uint8_t kDevelopmentDAC_Cert_FFF2_801E[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x55, 0x21, 0xb7, 0x2a, 0xf5, 0xb9,
+    0x22, 0x88, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x45, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x45, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xca, 0xa6, 0xf6, 0x74, 0xfa, 0x2b, 0x19, 0x46,
+    0xd9, 0x72, 0x14, 0x18, 0x73, 0x08, 0x76, 0x8b, 0x63, 0xf7, 0x28, 0xcc, 0x91, 0x97, 0xe2, 0x9b, 0xde, 0x0e, 0x1b, 0xc8, 0xd7,
+    0xa5, 0xb2, 0xd9, 0x90, 0xb9, 0x6e, 0x2b, 0x73, 0xf1, 0x9f, 0x05, 0xc3, 0xe6, 0x06, 0x11, 0x50, 0x78, 0xa5, 0xa3, 0x44, 0xe0,
+    0x61, 0x12, 0xf1, 0x43, 0x44, 0xbd, 0xc3, 0x18, 0xb1, 0xfb, 0xec, 0xd5, 0x2c, 0xc6, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x13, 0x20, 0xd7, 0x24,
+    0x14, 0xe4, 0x39, 0x21, 0xe5, 0xcb, 0x6e, 0xd7, 0xaf, 0x66, 0xd0, 0x02, 0x73, 0x76, 0xd8, 0x79, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x36, 0x93, 0x9b, 0x2a, 0xde, 0x1e, 0x98, 0x28, 0x3d, 0xca, 0xb4, 0x6c, 0xab, 0xfd, 0xb7, 0xfa,
+    0xbc, 0x81, 0x96, 0x17, 0xb5, 0x6d, 0x0f, 0x35, 0xaa, 0x1e, 0x83, 0x9d, 0xfa, 0x69, 0x6e, 0x74, 0x02, 0x20, 0x6e, 0xc1, 0x39,
+    0x9d, 0x1e, 0x54, 0x21, 0x0c, 0x18, 0x35, 0x47, 0xe0, 0x10, 0x0d, 0xc5, 0xb4, 0xc9, 0x7b, 0x93, 0x8a, 0x48, 0xc9, 0xaa, 0xf0,
+    0x31, 0x36, 0xa4, 0xfc, 0x9c, 0xaa, 0x50, 0x5f,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_801E[65] = {
+    0x04, 0xca, 0xa6, 0xf6, 0x74, 0xfa, 0x2b, 0x19, 0x46, 0xd9, 0x72, 0x14, 0x18, 0x73, 0x08, 0x76, 0x8b,
+    0x63, 0xf7, 0x28, 0xcc, 0x91, 0x97, 0xe2, 0x9b, 0xde, 0x0e, 0x1b, 0xc8, 0xd7, 0xa5, 0xb2, 0xd9, 0x90,
+    0xb9, 0x6e, 0x2b, 0x73, 0xf1, 0x9f, 0x05, 0xc3, 0xe6, 0x06, 0x11, 0x50, 0x78, 0xa5, 0xa3, 0x44, 0xe0,
+    0x61, 0x12, 0xf1, 0x43, 0x44, 0xbd, 0xc3, 0x18, 0xb1, 0xfb, 0xec, 0xd5, 0x2c, 0xc6,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801E[32] = {
+    0x56, 0xef, 0x8a, 0xd1, 0x42, 0x63, 0xdc, 0x0b, 0x67, 0x8e, 0x96, 0x90, 0xad, 0x77, 0x09, 0x18,
+    0x1b, 0xa6, 0x41, 0x55, 0x57, 0x13, 0x2f, 0x6d, 0xa5, 0xf5, 0xb1, 0x7f, 0xa8, 0x2b, 0xb7, 0x11,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_801E);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_801E);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_801E);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801F
+const uint8_t kDevelopmentDAC_Cert_FFF2_801F[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x66, 0x1f, 0xa2, 0xc0, 0x92, 0x43,
+    0x94, 0xe8, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x32, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x46, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x46, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x0a, 0x29, 0x69, 0xf8, 0x81, 0xf7, 0x01, 0x98,
+    0x58, 0x27, 0x80, 0xa4, 0x39, 0x48, 0x09, 0xe4, 0xf1, 0x3d, 0x38, 0x7e, 0x68, 0x13, 0x31, 0xea, 0x17, 0x11, 0x19, 0x6f, 0xaa,
+    0x80, 0x93, 0xe9, 0x85, 0xe1, 0x83, 0x67, 0x45, 0x97, 0xa7, 0xea, 0xe8, 0xa9, 0xa2, 0x27, 0xee, 0xd2, 0x7b, 0x70, 0x1c, 0xf0,
+    0x49, 0x7a, 0xf3, 0x8b, 0x80, 0x13, 0x29, 0x59, 0x66, 0x93, 0x6d, 0x47, 0x86, 0x51, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xa7, 0x22, 0x27, 0x27,
+    0x90, 0xd8, 0x26, 0x82, 0x8a, 0x04, 0xc9, 0xfc, 0xdc, 0x3a, 0x77, 0x66, 0x62, 0x23, 0x49, 0x42, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x04, 0xce, 0x5b, 0xa1, 0x90, 0xfe, 0xc1, 0x69, 0x1f, 0x44, 0x63, 0x35, 0x44, 0xc4, 0x79, 0x77,
+    0x71, 0x09, 0x1f, 0x23, 0x4b, 0x3c, 0xfe, 0xaf, 0x59, 0xde, 0x88, 0xc0, 0x20, 0x73, 0x36, 0xe5, 0x02, 0x20, 0x2d, 0x1c, 0x5f,
+    0xc7, 0x1f, 0xee, 0xf0, 0x37, 0x28, 0x36, 0xb7, 0x62, 0x64, 0x0b, 0xfa, 0x7a, 0x2c, 0xe3, 0x30, 0x71, 0x9d, 0x55, 0xbd, 0x6c,
+    0xbb, 0xbd, 0xee, 0xbb, 0xf9, 0x25, 0x78, 0x85,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF2_801F[65] = {
+    0x04, 0x0a, 0x29, 0x69, 0xf8, 0x81, 0xf7, 0x01, 0x98, 0x58, 0x27, 0x80, 0xa4, 0x39, 0x48, 0x09, 0xe4,
+    0xf1, 0x3d, 0x38, 0x7e, 0x68, 0x13, 0x31, 0xea, 0x17, 0x11, 0x19, 0x6f, 0xaa, 0x80, 0x93, 0xe9, 0x85,
+    0xe1, 0x83, 0x67, 0x45, 0x97, 0xa7, 0xea, 0xe8, 0xa9, 0xa2, 0x27, 0xee, 0xd2, 0x7b, 0x70, 0x1c, 0xf0,
+    0x49, 0x7a, 0xf3, 0x8b, 0x80, 0x13, 0x29, 0x59, 0x66, 0x93, 0x6d, 0x47, 0x86, 0x51,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801F[32] = {
+    0x01, 0xd3, 0x8b, 0x6e, 0x9c, 0x63, 0xe2, 0x0f, 0x91, 0x46, 0x46, 0x25, 0x4e, 0x58, 0xb3, 0xa3,
+    0x8f, 0xea, 0xa7, 0xf2, 0x1e, 0x71, 0x4d, 0xb0, 0xa3, 0xda, 0x66, 0xe7, 0xb2, 0x62, 0x1d, 0xf0,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF2_801F);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF2_801F);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF2_801F);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8000
+const uint8_t kDevelopmentDAC_Cert_FFF3_8000[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x49, 0xa5, 0x4a, 0x7e, 0xfc, 0xac,
+    0xf3, 0xd4, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x30, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x30, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x85, 0xef, 0x3b, 0xde, 0xc7, 0x59, 0x2b, 0xbf,
+    0xd0, 0xc8, 0xd1, 0x71, 0x3e, 0x95, 0x9f, 0x3a, 0x51, 0x48, 0x3c, 0xcf, 0x56, 0x13, 0xfe, 0x40, 0x85, 0x22, 0x8b, 0x9f, 0xfb,
+    0xff, 0x33, 0x92, 0x7e, 0xb4, 0xa0, 0xc0, 0xb7, 0x82, 0x5c, 0x9f, 0xd6, 0x25, 0x56, 0x8b, 0xba, 0x69, 0x20, 0xc7, 0x5e, 0x93,
+    0xb3, 0x64, 0x86, 0x77, 0xb2, 0x1b, 0x8a, 0x57, 0x74, 0xd1, 0x69, 0x94, 0xb3, 0xca, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x8c, 0x04, 0x9a, 0xce,
+    0xc1, 0x60, 0x89, 0x67, 0xc4, 0xa3, 0x28, 0xa1, 0xaa, 0x5e, 0xd2, 0xe5, 0x64, 0xf6, 0x10, 0xfd, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x10, 0x15, 0xb5, 0xbe, 0x36, 0x4b, 0x80, 0x3f, 0x1e, 0x9d, 0x2f, 0x64, 0x61, 0x00, 0xeb, 0xbc,
+    0x3d, 0x13, 0x53, 0x9c, 0x66, 0x4a, 0xea, 0xda, 0xc9, 0xbd, 0x0d, 0x23, 0xee, 0xee, 0x41, 0xf6, 0x02, 0x21, 0x00, 0xad, 0xca,
+    0xb1, 0x20, 0xed, 0x41, 0x48, 0xb8, 0x06, 0x41, 0x41, 0x62, 0xb4, 0xd5, 0x42, 0xbb, 0x2e, 0xd0, 0x97, 0x40, 0x52, 0x4d, 0xdf,
+    0xf3, 0xfd, 0xef, 0xe5, 0x9d, 0x6a, 0x7b, 0x26, 0x61,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8000[65] = {
+    0x04, 0x85, 0xef, 0x3b, 0xde, 0xc7, 0x59, 0x2b, 0xbf, 0xd0, 0xc8, 0xd1, 0x71, 0x3e, 0x95, 0x9f, 0x3a,
+    0x51, 0x48, 0x3c, 0xcf, 0x56, 0x13, 0xfe, 0x40, 0x85, 0x22, 0x8b, 0x9f, 0xfb, 0xff, 0x33, 0x92, 0x7e,
+    0xb4, 0xa0, 0xc0, 0xb7, 0x82, 0x5c, 0x9f, 0xd6, 0x25, 0x56, 0x8b, 0xba, 0x69, 0x20, 0xc7, 0x5e, 0x93,
+    0xb3, 0x64, 0x86, 0x77, 0xb2, 0x1b, 0x8a, 0x57, 0x74, 0xd1, 0x69, 0x94, 0xb3, 0xca,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8000[32] = {
+    0x0a, 0x92, 0xdf, 0x57, 0xc2, 0xbb, 0xdd, 0x29, 0x2e, 0x43, 0x0d, 0x4d, 0x7d, 0xf9, 0xdf, 0xaa,
+    0xd5, 0xcc, 0x57, 0x8f, 0xde, 0x5a, 0xa3, 0xf3, 0xdb, 0x3d, 0xf3, 0x01, 0x65, 0xbf, 0x35, 0x6b,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8000);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8000);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8000);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8001
+const uint8_t kDevelopmentDAC_Cert_FFF3_8001[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x28, 0xf6, 0x0c, 0xc9, 0x74, 0x12,
+    0x2b, 0x6f, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x31, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x31, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x97, 0x77, 0x63, 0x37, 0x9f, 0x88, 0xa9, 0xa4,
+    0x99, 0xba, 0xfd, 0xf5, 0x31, 0xad, 0x4b, 0x1b, 0xcd, 0xff, 0xd1, 0x00, 0x86, 0xc0, 0x02, 0x29, 0xda, 0xdc, 0xbd, 0xdb, 0xf1,
+    0x42, 0x5a, 0x1f, 0xa2, 0xc0, 0x5c, 0x9d, 0x22, 0x35, 0x9e, 0x7d, 0x7b, 0xf8, 0x5d, 0xab, 0xd4, 0xf3, 0xb1, 0x7d, 0x7d, 0xdb,
+    0x18, 0xcd, 0xe6, 0x79, 0x18, 0x9c, 0x22, 0x70, 0x7d, 0x0e, 0x3d, 0xb4, 0x99, 0xf8, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x55, 0x4f, 0x29, 0xc3,
+    0xe5, 0x7b, 0x6d, 0x20, 0xc4, 0x54, 0x7e, 0x93, 0x05, 0x82, 0xb3, 0x23, 0x0b, 0xbe, 0x7c, 0xd1, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x7a, 0x9d, 0xfc, 0xf5, 0xa7, 0x26, 0x30, 0x0b, 0x96, 0x10, 0x09, 0x28, 0x3f, 0x6d, 0x95, 0x88,
+    0x9b, 0x50, 0x4d, 0xfe, 0xb6, 0x7e, 0x72, 0xf4, 0xd2, 0x76, 0xb7, 0x76, 0xcc, 0x14, 0xae, 0x45, 0x02, 0x21, 0x00, 0x87, 0xc9,
+    0xe5, 0x7d, 0x95, 0x03, 0x21, 0x1d, 0x8f, 0xac, 0x41, 0xb0, 0xb8, 0x3a, 0x99, 0xee, 0x9c, 0xda, 0x4f, 0xea, 0x1e, 0x5f, 0xc4,
+    0xdd, 0xe5, 0xaf, 0x3a, 0x7c, 0xd6, 0xf3, 0xcc, 0xb6,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8001[65] = {
+    0x04, 0x97, 0x77, 0x63, 0x37, 0x9f, 0x88, 0xa9, 0xa4, 0x99, 0xba, 0xfd, 0xf5, 0x31, 0xad, 0x4b, 0x1b,
+    0xcd, 0xff, 0xd1, 0x00, 0x86, 0xc0, 0x02, 0x29, 0xda, 0xdc, 0xbd, 0xdb, 0xf1, 0x42, 0x5a, 0x1f, 0xa2,
+    0xc0, 0x5c, 0x9d, 0x22, 0x35, 0x9e, 0x7d, 0x7b, 0xf8, 0x5d, 0xab, 0xd4, 0xf3, 0xb1, 0x7d, 0x7d, 0xdb,
+    0x18, 0xcd, 0xe6, 0x79, 0x18, 0x9c, 0x22, 0x70, 0x7d, 0x0e, 0x3d, 0xb4, 0x99, 0xf8,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8001[32] = {
+    0x34, 0x5b, 0x8d, 0xd7, 0xd0, 0x75, 0xa4, 0xc7, 0xb3, 0xcb, 0x73, 0x29, 0x8a, 0x43, 0x78, 0x16,
+    0x4b, 0xf6, 0x15, 0xdc, 0x81, 0xbf, 0x91, 0x70, 0x0b, 0x7f, 0xde, 0x40, 0xdd, 0xa4, 0x65, 0x04,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8001);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8001);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8001);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8002
+const uint8_t kDevelopmentDAC_Cert_FFF3_8002[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x67, 0xee, 0x26, 0x91, 0xff, 0x4d,
+    0x39, 0x69, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x32, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x32, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xf7, 0x05, 0x3d, 0xf1, 0xaa, 0x87, 0x1e, 0x19,
+    0x05, 0x11, 0x6d, 0xb5, 0x36, 0x88, 0x99, 0xbd, 0xfa, 0x80, 0x5a, 0x6d, 0xa8, 0x16, 0x20, 0x7b, 0xcc, 0x34, 0x0e, 0x7d, 0xcf,
+    0x7c, 0xf5, 0x42, 0x86, 0x34, 0x4a, 0xf3, 0x40, 0x9a, 0x73, 0x8e, 0x57, 0x6f, 0xc5, 0xc0, 0xcd, 0xf3, 0x80, 0x81, 0xe0, 0x9d,
+    0x38, 0x31, 0x77, 0xf4, 0x53, 0xe7, 0xce, 0xe4, 0x58, 0xbe, 0x44, 0xe6, 0x6f, 0x52, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x4c, 0xb3, 0xb3, 0x80,
+    0xe4, 0xd1, 0xc9, 0x40, 0x10, 0x26, 0x66, 0x96, 0x26, 0x80, 0xad, 0x64, 0xb6, 0xaa, 0x8b, 0x34, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x10, 0x05, 0x03, 0x1d, 0xa9, 0xd2, 0x87, 0xf5, 0x87, 0x36, 0x43, 0x9f, 0x08, 0x3c, 0x99, 0xfe,
+    0x02, 0x64, 0x23, 0x07, 0xca, 0x93, 0x22, 0x49, 0x36, 0xbc, 0xd3, 0x7e, 0x97, 0x0d, 0x6d, 0x4c, 0x02, 0x20, 0x05, 0xa6, 0xcd,
+    0xfe, 0x44, 0x22, 0x15, 0xe6, 0xbb, 0xac, 0x39, 0xd7, 0x73, 0x8a, 0x3f, 0x07, 0x14, 0x4f, 0x2a, 0xbb, 0x7d, 0x4c, 0x58, 0x55,
+    0x0a, 0xe1, 0xd0, 0xd8, 0x75, 0xf5, 0xe5, 0x43,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8002[65] = {
+    0x04, 0xf7, 0x05, 0x3d, 0xf1, 0xaa, 0x87, 0x1e, 0x19, 0x05, 0x11, 0x6d, 0xb5, 0x36, 0x88, 0x99, 0xbd,
+    0xfa, 0x80, 0x5a, 0x6d, 0xa8, 0x16, 0x20, 0x7b, 0xcc, 0x34, 0x0e, 0x7d, 0xcf, 0x7c, 0xf5, 0x42, 0x86,
+    0x34, 0x4a, 0xf3, 0x40, 0x9a, 0x73, 0x8e, 0x57, 0x6f, 0xc5, 0xc0, 0xcd, 0xf3, 0x80, 0x81, 0xe0, 0x9d,
+    0x38, 0x31, 0x77, 0xf4, 0x53, 0xe7, 0xce, 0xe4, 0x58, 0xbe, 0x44, 0xe6, 0x6f, 0x52,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8002[32] = {
+    0x57, 0xe1, 0xf5, 0xc2, 0xd6, 0x20, 0x2e, 0xd3, 0x0f, 0x5d, 0x64, 0xd2, 0x97, 0x9c, 0x92, 0x31,
+    0x95, 0x53, 0x69, 0x17, 0xab, 0xb0, 0xf7, 0xf5, 0x66, 0x12, 0x6a, 0x47, 0x7b, 0x37, 0x60, 0x82,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8002);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8002);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8002);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8003
+const uint8_t kDevelopmentDAC_Cert_FFF3_8003[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x28, 0xd6, 0x90, 0x57, 0xeb, 0xcc,
+    0x86, 0xe5, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x33, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x0d, 0xc5, 0x9b, 0xea, 0x0a, 0x9c, 0x4c, 0x09,
+    0x1c, 0x0f, 0xeb, 0x54, 0x1f, 0xbd, 0x3d, 0xf7, 0x88, 0x95, 0x91, 0xc5, 0x3c, 0xc6, 0x16, 0x1a, 0x5d, 0x1d, 0x6b, 0x4e, 0xb3,
+    0xa4, 0x39, 0x91, 0xa3, 0x7f, 0x56, 0xc1, 0x2d, 0xeb, 0x77, 0xfe, 0x81, 0x71, 0xcb, 0x70, 0xb7, 0x04, 0x75, 0x67, 0x17, 0x20,
+    0x6f, 0x39, 0x5a, 0x8a, 0x92, 0x5d, 0x91, 0x62, 0x16, 0x72, 0x1d, 0x6d, 0x07, 0x94, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xbc, 0x1f, 0x58, 0x0c,
+    0x94, 0x3c, 0x27, 0x19, 0x84, 0x24, 0x0f, 0x5c, 0x74, 0x94, 0x4e, 0xc6, 0x5d, 0xa6, 0xd5, 0xcc, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0x96, 0x12, 0x3a, 0x4c, 0x27, 0x64, 0x7f, 0x0f, 0x5a, 0x3a, 0x43, 0x56, 0x2c, 0x5e, 0x0b,
+    0x30, 0xbe, 0xff, 0xb9, 0x52, 0x43, 0x75, 0x91, 0x5f, 0x90, 0x76, 0xa0, 0x73, 0x95, 0x33, 0x68, 0x67, 0x02, 0x21, 0x00, 0x9d,
+    0x6c, 0x0e, 0xc1, 0xfc, 0x84, 0x07, 0x27, 0xaf, 0xd8, 0x76, 0xfe, 0xbe, 0xf2, 0x58, 0x69, 0xb8, 0xb2, 0x51, 0x27, 0xfd, 0x5e,
+    0xca, 0x94, 0xa5, 0xd3, 0xd1, 0xe5, 0xd2, 0xb3, 0x7e, 0xa3,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8003[65] = {
+    0x04, 0x0d, 0xc5, 0x9b, 0xea, 0x0a, 0x9c, 0x4c, 0x09, 0x1c, 0x0f, 0xeb, 0x54, 0x1f, 0xbd, 0x3d, 0xf7,
+    0x88, 0x95, 0x91, 0xc5, 0x3c, 0xc6, 0x16, 0x1a, 0x5d, 0x1d, 0x6b, 0x4e, 0xb3, 0xa4, 0x39, 0x91, 0xa3,
+    0x7f, 0x56, 0xc1, 0x2d, 0xeb, 0x77, 0xfe, 0x81, 0x71, 0xcb, 0x70, 0xb7, 0x04, 0x75, 0x67, 0x17, 0x20,
+    0x6f, 0x39, 0x5a, 0x8a, 0x92, 0x5d, 0x91, 0x62, 0x16, 0x72, 0x1d, 0x6d, 0x07, 0x94,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8003[32] = {
+    0x92, 0xb2, 0x36, 0x15, 0xd9, 0x8c, 0x7c, 0xb1, 0x0c, 0x87, 0x21, 0xc5, 0x32, 0xbc, 0xa0, 0x60,
+    0xbf, 0x5e, 0x05, 0x95, 0xfd, 0xdc, 0xa7, 0x85, 0x02, 0xe9, 0xe1, 0x7c, 0x35, 0x51, 0xe9, 0x88,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8003);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8003);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8003);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8004
+const uint8_t kDevelopmentDAC_Cert_FFF3_8004[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x7b, 0x7c, 0x1a, 0xdf, 0xf1, 0x64,
+    0x35, 0x10, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x34, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x34, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xd7, 0xe3, 0xfe, 0x3c, 0x4b, 0x54, 0xc9, 0xd7,
+    0xbd, 0xb0, 0x5f, 0x24, 0xd3, 0x70, 0x77, 0xb4, 0xaf, 0xef, 0x98, 0x34, 0x09, 0xad, 0x35, 0x06, 0x53, 0xe9, 0x68, 0xf5, 0x13,
+    0x13, 0x71, 0x0c, 0x2d, 0xbc, 0x17, 0x76, 0x74, 0x95, 0x7e, 0x26, 0xc2, 0xd0, 0x04, 0xac, 0x18, 0x98, 0x58, 0xe4, 0x28, 0xf5,
+    0x92, 0x4c, 0x5d, 0xda, 0x18, 0xd0, 0xa1, 0xc5, 0x38, 0x8c, 0x97, 0x2d, 0xe6, 0x1a, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xe8, 0xea, 0x40, 0x02,
+    0xa6, 0x67, 0x2c, 0x55, 0x32, 0x16, 0x40, 0x05, 0x50, 0x7b, 0xdd, 0x52, 0x55, 0x29, 0x3a, 0x60, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0x94, 0x5e, 0x0f, 0x5e, 0xa1, 0x98, 0x6d, 0xe1, 0x14, 0x58, 0x84, 0x86, 0x19, 0x2d, 0xf5,
+    0xaa, 0x03, 0xca, 0x12, 0xf6, 0x68, 0x7c, 0xfb, 0xeb, 0xd7, 0x71, 0xad, 0x10, 0xb7, 0x15, 0x7f, 0x50, 0x02, 0x21, 0x00, 0xe6,
+    0x07, 0x1d, 0xe7, 0x16, 0x57, 0xf7, 0x0f, 0x91, 0x99, 0xd6, 0xfe, 0x5c, 0x67, 0x7f, 0xbe, 0x49, 0x2a, 0x74, 0x07, 0x2d, 0x0e,
+    0x7a, 0x2b, 0xea, 0x91, 0x36, 0x5e, 0x80, 0x49, 0x95, 0x55,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8004[65] = {
+    0x04, 0xd7, 0xe3, 0xfe, 0x3c, 0x4b, 0x54, 0xc9, 0xd7, 0xbd, 0xb0, 0x5f, 0x24, 0xd3, 0x70, 0x77, 0xb4,
+    0xaf, 0xef, 0x98, 0x34, 0x09, 0xad, 0x35, 0x06, 0x53, 0xe9, 0x68, 0xf5, 0x13, 0x13, 0x71, 0x0c, 0x2d,
+    0xbc, 0x17, 0x76, 0x74, 0x95, 0x7e, 0x26, 0xc2, 0xd0, 0x04, 0xac, 0x18, 0x98, 0x58, 0xe4, 0x28, 0xf5,
+    0x92, 0x4c, 0x5d, 0xda, 0x18, 0xd0, 0xa1, 0xc5, 0x38, 0x8c, 0x97, 0x2d, 0xe6, 0x1a,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8004[32] = {
+    0x15, 0x25, 0x94, 0xd3, 0xfd, 0x57, 0x39, 0x88, 0x7a, 0x19, 0x80, 0xcb, 0xcb, 0xb6, 0x77, 0x84,
+    0x04, 0xa3, 0x89, 0x01, 0x17, 0x28, 0xb7, 0xd3, 0xcc, 0xe9, 0x80, 0x0b, 0xc4, 0x57, 0x77, 0x7c,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8004);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8004);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8004);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8005
+const uint8_t kDevelopmentDAC_Cert_FFF3_8005[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x35, 0x77, 0x04, 0x70, 0xfa, 0x15,
+    0xb8, 0x4a, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x35, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x35, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x9d, 0x3b, 0x8a, 0x22, 0x6b, 0x77, 0xd0, 0xc8,
+    0x9d, 0x71, 0x29, 0xa3, 0x34, 0x33, 0xdb, 0x6b, 0x57, 0xcd, 0x1a, 0x1e, 0xdc, 0xae, 0x99, 0x01, 0xe8, 0x2c, 0xa2, 0xba, 0xc2,
+    0x7e, 0x9f, 0xfc, 0x7c, 0x4a, 0xca, 0xa8, 0x23, 0x84, 0x1f, 0x2b, 0x2e, 0x86, 0x63, 0x07, 0xc6, 0x6d, 0x29, 0x19, 0xf7, 0x99,
+    0x4e, 0x63, 0xfc, 0xf8, 0xea, 0x8e, 0x43, 0x4f, 0xe1, 0xe1, 0x4e, 0x1f, 0x40, 0x5c, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x17, 0x4b, 0x11, 0x99,
+    0xba, 0x32, 0x85, 0xe7, 0xc0, 0x7e, 0xbd, 0xe5, 0x6d, 0xd6, 0xdb, 0xdd, 0xb5, 0xcb, 0x7a, 0x17, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xb9, 0x27, 0x9f, 0xa8, 0xf7, 0x58, 0x39, 0x67, 0x82, 0x92, 0xc5, 0xbb, 0xf2, 0xb0, 0xd4,
+    0xb3, 0x3c, 0x39, 0x5d, 0x95, 0xe9, 0x78, 0xe0, 0x70, 0x96, 0x4a, 0x75, 0xa2, 0xed, 0xbc, 0x27, 0x7b, 0x02, 0x20, 0x54, 0x89,
+    0xf3, 0xd0, 0x68, 0xa3, 0xc9, 0x19, 0xf2, 0xa0, 0x64, 0x31, 0x71, 0x26, 0x83, 0x86, 0xf6, 0xbe, 0xdc, 0xa0, 0xbc, 0xbc, 0x1c,
+    0xdb, 0x07, 0x6e, 0x86, 0xb2, 0xe9, 0x91, 0xa1, 0x0d,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8005[65] = {
+    0x04, 0x9d, 0x3b, 0x8a, 0x22, 0x6b, 0x77, 0xd0, 0xc8, 0x9d, 0x71, 0x29, 0xa3, 0x34, 0x33, 0xdb, 0x6b,
+    0x57, 0xcd, 0x1a, 0x1e, 0xdc, 0xae, 0x99, 0x01, 0xe8, 0x2c, 0xa2, 0xba, 0xc2, 0x7e, 0x9f, 0xfc, 0x7c,
+    0x4a, 0xca, 0xa8, 0x23, 0x84, 0x1f, 0x2b, 0x2e, 0x86, 0x63, 0x07, 0xc6, 0x6d, 0x29, 0x19, 0xf7, 0x99,
+    0x4e, 0x63, 0xfc, 0xf8, 0xea, 0x8e, 0x43, 0x4f, 0xe1, 0xe1, 0x4e, 0x1f, 0x40, 0x5c,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8005[32] = {
+    0xba, 0x77, 0x8a, 0x4e, 0x10, 0x7d, 0x21, 0xde, 0xb7, 0xe0, 0x61, 0xee, 0x36, 0xa5, 0x29, 0x4f,
+    0x0a, 0x74, 0x0c, 0xd7, 0x83, 0x7b, 0xee, 0x11, 0x2a, 0x3c, 0x0e, 0x4a, 0xd7, 0xd6, 0x52, 0xda,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8005);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8005);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8005);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8006
+const uint8_t kDevelopmentDAC_Cert_FFF3_8006[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x5b, 0x37, 0xa8, 0x13, 0x59, 0x29,
+    0xb6, 0x8b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x36, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x36, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xe3, 0xdd, 0x32, 0x70, 0xc3, 0x56, 0xbc, 0x5b,
+    0x24, 0x45, 0x75, 0xd0, 0xec, 0x11, 0x4f, 0x34, 0xb9, 0x53, 0xba, 0x75, 0x6c, 0xb9, 0x55, 0x16, 0xfa, 0x39, 0x04, 0x90, 0x89,
+    0x23, 0x04, 0x39, 0x03, 0x90, 0xd6, 0xde, 0xc4, 0x66, 0xdd, 0xac, 0x51, 0xb4, 0x5c, 0xe6, 0xb5, 0xb8, 0x05, 0xf8, 0x1a, 0x1c,
+    0xa6, 0x60, 0x43, 0x45, 0x7e, 0x87, 0xd5, 0xe8, 0x86, 0xb2, 0x74, 0xcf, 0x4c, 0x43, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x1e, 0xd7, 0x3d, 0x33,
+    0x83, 0xe7, 0xf7, 0x6e, 0xb7, 0x42, 0x5a, 0x66, 0xa5, 0x74, 0xdb, 0x74, 0x47, 0xf4, 0x5d, 0x91, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x3f, 0x44, 0xba, 0x13, 0x93, 0x2b, 0xd4, 0x81, 0x60, 0x19, 0xc0, 0x7f, 0xf0, 0xc6, 0xe7, 0x02,
+    0x3f, 0x46, 0x7b, 0xaa, 0x14, 0x8f, 0x13, 0x12, 0x5d, 0x64, 0x69, 0xc5, 0x69, 0x7a, 0xa8, 0x96, 0x02, 0x20, 0x37, 0xc5, 0xeb,
+    0xbb, 0x91, 0xaf, 0x89, 0x5c, 0xde, 0x3f, 0x7d, 0x7f, 0x31, 0xd1, 0xa9, 0xb4, 0x85, 0xc1, 0xda, 0x06, 0xb4, 0x76, 0x80, 0x64,
+    0xf9, 0xd8, 0x3f, 0x43, 0x45, 0x83, 0xc5, 0x2d,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8006[65] = {
+    0x04, 0xe3, 0xdd, 0x32, 0x70, 0xc3, 0x56, 0xbc, 0x5b, 0x24, 0x45, 0x75, 0xd0, 0xec, 0x11, 0x4f, 0x34,
+    0xb9, 0x53, 0xba, 0x75, 0x6c, 0xb9, 0x55, 0x16, 0xfa, 0x39, 0x04, 0x90, 0x89, 0x23, 0x04, 0x39, 0x03,
+    0x90, 0xd6, 0xde, 0xc4, 0x66, 0xdd, 0xac, 0x51, 0xb4, 0x5c, 0xe6, 0xb5, 0xb8, 0x05, 0xf8, 0x1a, 0x1c,
+    0xa6, 0x60, 0x43, 0x45, 0x7e, 0x87, 0xd5, 0xe8, 0x86, 0xb2, 0x74, 0xcf, 0x4c, 0x43,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8006[32] = {
+    0xe0, 0xb8, 0x0e, 0xf4, 0x10, 0xfa, 0x0d, 0xd0, 0x6d, 0xbc, 0xc5, 0x18, 0x80, 0xf9, 0xf6, 0xaf,
+    0xf9, 0xfa, 0x03, 0x63, 0xf5, 0x11, 0x88, 0xdf, 0x8a, 0x1e, 0x2f, 0xe6, 0xfd, 0x47, 0x5d, 0x24,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8006);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8006);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8006);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8007
+const uint8_t kDevelopmentDAC_Cert_FFF3_8007[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x29, 0x62, 0x25, 0xbf, 0x0d, 0xcf,
+    0x30, 0x47, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x37, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x37, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xb7, 0xff, 0x2b, 0x36, 0xa1, 0x0a, 0xfe, 0x93,
+    0x17, 0x51, 0xa3, 0xc7, 0xbb, 0xeb, 0x1d, 0x6c, 0x7b, 0xd3, 0x0f, 0x7f, 0xde, 0xb7, 0xc0, 0xcc, 0x10, 0x71, 0x67, 0x9a, 0x50,
+    0x12, 0xa7, 0x1d, 0x37, 0x19, 0x9f, 0xeb, 0x3a, 0xea, 0xfa, 0x6f, 0xaf, 0x3b, 0x70, 0xb8, 0xf1, 0x12, 0x6b, 0x46, 0xd2, 0xcf,
+    0x23, 0xe5, 0x4b, 0x15, 0xff, 0x0f, 0x5a, 0xec, 0x0c, 0xf8, 0xdf, 0x11, 0x2c, 0xde, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x09, 0x00, 0xfa, 0x70,
+    0x93, 0x5d, 0xbb, 0x39, 0x5c, 0xc9, 0xc8, 0x18, 0xcb, 0xf3, 0x7b, 0x66, 0xd6, 0x63, 0xba, 0x7b, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x30, 0x54, 0x51, 0xc8, 0x20, 0x5f, 0xe2, 0x01, 0x84, 0x14, 0x78, 0x7f, 0xca, 0xa3, 0xf4, 0xd6,
+    0x8a, 0xf8, 0xe0, 0x08, 0xc0, 0x43, 0xaa, 0x6c, 0xb9, 0x71, 0x64, 0x99, 0xa6, 0xcb, 0x9a, 0x8a, 0x02, 0x21, 0x00, 0x84, 0xb1,
+    0x70, 0xed, 0xf7, 0xc6, 0xcc, 0x03, 0x0c, 0x7e, 0x1b, 0x79, 0xc8, 0x13, 0x43, 0xb6, 0x80, 0x72, 0x2f, 0x7a, 0x64, 0xcf, 0x22,
+    0xb5, 0x6f, 0x27, 0x49, 0x6a, 0x92, 0xef, 0xc6, 0x89,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8007[65] = {
+    0x04, 0xb7, 0xff, 0x2b, 0x36, 0xa1, 0x0a, 0xfe, 0x93, 0x17, 0x51, 0xa3, 0xc7, 0xbb, 0xeb, 0x1d, 0x6c,
+    0x7b, 0xd3, 0x0f, 0x7f, 0xde, 0xb7, 0xc0, 0xcc, 0x10, 0x71, 0x67, 0x9a, 0x50, 0x12, 0xa7, 0x1d, 0x37,
+    0x19, 0x9f, 0xeb, 0x3a, 0xea, 0xfa, 0x6f, 0xaf, 0x3b, 0x70, 0xb8, 0xf1, 0x12, 0x6b, 0x46, 0xd2, 0xcf,
+    0x23, 0xe5, 0x4b, 0x15, 0xff, 0x0f, 0x5a, 0xec, 0x0c, 0xf8, 0xdf, 0x11, 0x2c, 0xde,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8007[32] = {
+    0x1d, 0xf3, 0xf2, 0x74, 0x14, 0x2a, 0xb1, 0xe2, 0x01, 0x41, 0xed, 0x03, 0xb5, 0x48, 0x7a, 0xb6,
+    0xa0, 0x85, 0x3c, 0x8b, 0xbe, 0xd1, 0x4f, 0xa9, 0x66, 0x87, 0xb8, 0x7e, 0x36, 0x1b, 0xaa, 0x20,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8007);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8007);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8007);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8008
+const uint8_t kDevelopmentDAC_Cert_FFF3_8008[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x41, 0x5e, 0xab, 0x36, 0xae, 0xc5,
+    0x9d, 0x0d, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x38, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x38, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xc2, 0x28, 0xd0, 0x2f, 0x64, 0x7a, 0x1b, 0x29,
+    0x33, 0x46, 0xed, 0x06, 0xc8, 0x43, 0x39, 0xa7, 0xd5, 0x0d, 0x07, 0x93, 0x50, 0x8d, 0x59, 0x82, 0x3c, 0x12, 0x3a, 0xa3, 0x28,
+    0xce, 0x52, 0xdc, 0xc1, 0xa4, 0xcc, 0x1d, 0x78, 0xfe, 0x69, 0xc6, 0xba, 0xda, 0x89, 0x0e, 0x9c, 0x00, 0xa3, 0x18, 0x4d, 0xbf,
+    0xb3, 0x9a, 0xb8, 0x63, 0xd3, 0xf0, 0x22, 0x58, 0x45, 0x59, 0xc3, 0x85, 0x0e, 0xef, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x65, 0x27, 0xc1, 0x12,
+    0xf4, 0x42, 0x5b, 0x30, 0xcc, 0x0b, 0x9d, 0xc8, 0x25, 0x9b, 0x2e, 0x0e, 0xb2, 0x05, 0x73, 0x86, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x7c, 0x48, 0x2d, 0x31, 0xda, 0x6a, 0xf5, 0x1a, 0x24, 0xbc, 0xa2, 0xcf, 0x0f, 0x92, 0x0d, 0x4f,
+    0x7b, 0x50, 0xe8, 0x96, 0xcd, 0x60, 0x4b, 0x77, 0xa6, 0x3c, 0x6b, 0x80, 0x3b, 0x8a, 0x40, 0xed, 0x02, 0x21, 0x00, 0x89, 0x13,
+    0x21, 0x8b, 0x88, 0x51, 0x7a, 0x09, 0x59, 0x17, 0xf3, 0xd7, 0x96, 0xf1, 0x74, 0xda, 0xb7, 0xf1, 0x42, 0x32, 0xde, 0x8a, 0x85,
+    0x08, 0xb2, 0x5c, 0x21, 0xe5, 0xd6, 0x7c, 0x5b, 0xa9,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8008[65] = {
+    0x04, 0xc2, 0x28, 0xd0, 0x2f, 0x64, 0x7a, 0x1b, 0x29, 0x33, 0x46, 0xed, 0x06, 0xc8, 0x43, 0x39, 0xa7,
+    0xd5, 0x0d, 0x07, 0x93, 0x50, 0x8d, 0x59, 0x82, 0x3c, 0x12, 0x3a, 0xa3, 0x28, 0xce, 0x52, 0xdc, 0xc1,
+    0xa4, 0xcc, 0x1d, 0x78, 0xfe, 0x69, 0xc6, 0xba, 0xda, 0x89, 0x0e, 0x9c, 0x00, 0xa3, 0x18, 0x4d, 0xbf,
+    0xb3, 0x9a, 0xb8, 0x63, 0xd3, 0xf0, 0x22, 0x58, 0x45, 0x59, 0xc3, 0x85, 0x0e, 0xef,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8008[32] = {
+    0xae, 0x9d, 0xc9, 0x88, 0x4f, 0x28, 0x2f, 0x3c, 0xb2, 0x9c, 0x68, 0xd1, 0x5a, 0x4b, 0x66, 0x19,
+    0x21, 0x9e, 0x64, 0x55, 0x03, 0x7d, 0x32, 0xdc, 0x41, 0x9f, 0xca, 0x7d, 0x1c, 0x8f, 0xfd, 0xf1,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8008);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8008);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8008);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8009
+const uint8_t kDevelopmentDAC_Cert_FFF3_8009[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x27, 0xd3, 0x97, 0x49, 0x59, 0xa1,
+    0xbb, 0x15, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x39, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x39, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x00, 0x00, 0x49, 0x5d, 0xc0, 0x3b, 0xa7, 0xa8,
+    0x36, 0xee, 0xe4, 0x88, 0xa4, 0x70, 0x84, 0xc0, 0x2f, 0xd1, 0xd5, 0x19, 0xf7, 0x69, 0xd0, 0x5a, 0x44, 0xef, 0x2a, 0x2e, 0x0c,
+    0xd1, 0x78, 0x9d, 0x58, 0x5a, 0x37, 0xe0, 0x1e, 0x4c, 0x19, 0x5f, 0x0c, 0xcb, 0xca, 0x25, 0x68, 0xa8, 0x4e, 0x90, 0x5e, 0xc1,
+    0xfe, 0xd4, 0xe1, 0x92, 0x9f, 0x15, 0x63, 0xd2, 0x50, 0xcb, 0xde, 0x94, 0xea, 0xc5, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x2c, 0x1b, 0x4f, 0xb7,
+    0xe4, 0x77, 0x58, 0x71, 0x6e, 0x2f, 0xdc, 0x82, 0x25, 0x7d, 0xf7, 0xfa, 0x74, 0x64, 0x79, 0xfe, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x3f, 0xa8, 0x2b, 0xbb, 0x19, 0x5f, 0x9a, 0x73, 0x8e, 0x4a, 0x04, 0xd0, 0x50, 0x07, 0x01, 0xfc,
+    0x18, 0x57, 0x4b, 0xe0, 0x68, 0xa3, 0xfb, 0xd9, 0x69, 0x1c, 0x79, 0x76, 0x37, 0x68, 0xa6, 0x44, 0x02, 0x21, 0x00, 0x9d, 0x03,
+    0x71, 0xf5, 0x30, 0xf0, 0xb5, 0x74, 0x78, 0x63, 0x95, 0xc1, 0x07, 0x92, 0xd3, 0xe0, 0xde, 0xaf, 0x07, 0xb3, 0x21, 0xd3, 0xf1,
+    0x97, 0xca, 0xe4, 0x38, 0xd8, 0xca, 0xf9, 0xc5, 0x60,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8009[65] = {
+    0x04, 0x00, 0x00, 0x49, 0x5d, 0xc0, 0x3b, 0xa7, 0xa8, 0x36, 0xee, 0xe4, 0x88, 0xa4, 0x70, 0x84, 0xc0,
+    0x2f, 0xd1, 0xd5, 0x19, 0xf7, 0x69, 0xd0, 0x5a, 0x44, 0xef, 0x2a, 0x2e, 0x0c, 0xd1, 0x78, 0x9d, 0x58,
+    0x5a, 0x37, 0xe0, 0x1e, 0x4c, 0x19, 0x5f, 0x0c, 0xcb, 0xca, 0x25, 0x68, 0xa8, 0x4e, 0x90, 0x5e, 0xc1,
+    0xfe, 0xd4, 0xe1, 0x92, 0x9f, 0x15, 0x63, 0xd2, 0x50, 0xcb, 0xde, 0x94, 0xea, 0xc5,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8009[32] = {
+    0x7c, 0x8b, 0x60, 0xb5, 0x33, 0x34, 0xc7, 0x99, 0xf6, 0xd4, 0xd7, 0x82, 0xa1, 0xf8, 0xd9, 0xe8,
+    0xce, 0xf9, 0x1e, 0xdc, 0x06, 0x86, 0x64, 0xbf, 0x51, 0x4c, 0x5f, 0x58, 0x3f, 0xa2, 0x65, 0x56,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8009);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8009);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8009);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800A
+const uint8_t kDevelopmentDAC_Cert_FFF3_800A[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x27, 0x4b, 0x11, 0xe2, 0x96, 0x4d,
+    0xec, 0x16, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x41, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x41, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xc8, 0x7b, 0x0f, 0x7b, 0x73, 0xb7, 0x95, 0x3f,
+    0x69, 0xca, 0xb4, 0xc4, 0xde, 0x35, 0x81, 0xa5, 0xff, 0xb4, 0x94, 0xb2, 0x6b, 0x91, 0xd2, 0xd1, 0xe8, 0x11, 0x33, 0xb7, 0x1a,
+    0xa4, 0x07, 0x0d, 0x87, 0x26, 0xe5, 0xe0, 0xb5, 0x6e, 0x2f, 0x20, 0xc2, 0x55, 0xfb, 0xfd, 0xc2, 0x57, 0x48, 0xa0, 0xd2, 0x8a,
+    0x3f, 0x7b, 0x68, 0xc0, 0x45, 0xcd, 0x9c, 0xd0, 0x3d, 0x21, 0xf6, 0xbf, 0x35, 0xc6, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x32, 0x8b, 0x00, 0x61,
+    0x99, 0x3a, 0xfa, 0x5c, 0xda, 0x9f, 0xf7, 0x29, 0xff, 0x1b, 0x6a, 0xe1, 0x59, 0xdb, 0x45, 0xff, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x5b, 0x0b, 0x90, 0x26, 0xfb, 0xbc, 0x29, 0xf9, 0x83, 0x2b, 0xc6, 0x1a, 0x7c, 0x44, 0x88, 0xc3,
+    0x48, 0x3b, 0x9d, 0x2c, 0xcb, 0x0b, 0x99, 0xa3, 0x2f, 0x40, 0x2a, 0x1a, 0x03, 0x2c, 0x1d, 0x6d, 0x02, 0x20, 0x57, 0x4e, 0xd3,
+    0xb6, 0xcc, 0xbb, 0x3f, 0x6a, 0xa6, 0xfd, 0xa1, 0x91, 0xa2, 0x22, 0x73, 0x4d, 0xf5, 0xdb, 0xab, 0x85, 0x81, 0xfa, 0xa3, 0xa3,
+    0x05, 0x76, 0x66, 0xa7, 0x32, 0x7f, 0x61, 0x39,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_800A[65] = {
+    0x04, 0xc8, 0x7b, 0x0f, 0x7b, 0x73, 0xb7, 0x95, 0x3f, 0x69, 0xca, 0xb4, 0xc4, 0xde, 0x35, 0x81, 0xa5,
+    0xff, 0xb4, 0x94, 0xb2, 0x6b, 0x91, 0xd2, 0xd1, 0xe8, 0x11, 0x33, 0xb7, 0x1a, 0xa4, 0x07, 0x0d, 0x87,
+    0x26, 0xe5, 0xe0, 0xb5, 0x6e, 0x2f, 0x20, 0xc2, 0x55, 0xfb, 0xfd, 0xc2, 0x57, 0x48, 0xa0, 0xd2, 0x8a,
+    0x3f, 0x7b, 0x68, 0xc0, 0x45, 0xcd, 0x9c, 0xd0, 0x3d, 0x21, 0xf6, 0xbf, 0x35, 0xc6,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800A[32] = {
+    0x72, 0xed, 0x94, 0x6d, 0x5f, 0xed, 0xa7, 0x2c, 0x0e, 0x6d, 0x52, 0x47, 0x5d, 0x75, 0x1b, 0xb4,
+    0xbc, 0xc0, 0x1a, 0xe0, 0x09, 0x02, 0x0d, 0xa7, 0x2c, 0xd4, 0x8b, 0x32, 0x8a, 0x5c, 0x85, 0x8e,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_800A);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_800A);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_800A);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800B
+const uint8_t kDevelopmentDAC_Cert_FFF3_800B[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x11, 0x92, 0xa9, 0x26, 0x31, 0x35,
+    0x99, 0xbe, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x42, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x42, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x2d, 0x4f, 0x90, 0x38, 0x42, 0xe6, 0x10, 0x28,
+    0x39, 0xae, 0xa7, 0x00, 0x15, 0x31, 0x86, 0x7a, 0x7d, 0x3f, 0xd0, 0x73, 0xdd, 0x4c, 0x73, 0xcd, 0x10, 0xf3, 0xaf, 0x52, 0x48,
+    0xe2, 0x32, 0xb0, 0x28, 0x82, 0xa5, 0xb1, 0x17, 0x3d, 0x2c, 0x5f, 0xfc, 0x52, 0x49, 0x47, 0x7d, 0x61, 0xed, 0xff, 0xfd, 0x66,
+    0x67, 0x29, 0x44, 0xbc, 0x02, 0x5a, 0x87, 0x79, 0x44, 0x67, 0x71, 0x01, 0x68, 0x1d, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x6e, 0x94, 0x5c, 0xee,
+    0x51, 0x43, 0x5a, 0x93, 0xf4, 0xe4, 0xbf, 0xfe, 0x1a, 0x3c, 0xab, 0x3f, 0x3d, 0x4f, 0xfd, 0xea, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x0b, 0x8c, 0x81, 0xbd, 0xb8, 0xaf, 0xb3, 0xba, 0x09, 0x57, 0x5a, 0x02, 0x98, 0x45, 0x77, 0xc5,
+    0x8a, 0x48, 0x35, 0x20, 0x42, 0x9c, 0xfd, 0xa7, 0x53, 0xd3, 0xf1, 0xba, 0xb0, 0x84, 0x44, 0xa7, 0x02, 0x21, 0x00, 0xa0, 0xba,
+    0xeb, 0x9c, 0x57, 0x97, 0xd2, 0x17, 0x35, 0xe4, 0x1f, 0xda, 0x05, 0x0b, 0x30, 0xdd, 0xaa, 0x3f, 0xd7, 0xa1, 0x82, 0xe7, 0xf3,
+    0x47, 0xe8, 0xab, 0xa3, 0xcf, 0xf4, 0x66, 0x9b, 0x84,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_800B[65] = {
+    0x04, 0x2d, 0x4f, 0x90, 0x38, 0x42, 0xe6, 0x10, 0x28, 0x39, 0xae, 0xa7, 0x00, 0x15, 0x31, 0x86, 0x7a,
+    0x7d, 0x3f, 0xd0, 0x73, 0xdd, 0x4c, 0x73, 0xcd, 0x10, 0xf3, 0xaf, 0x52, 0x48, 0xe2, 0x32, 0xb0, 0x28,
+    0x82, 0xa5, 0xb1, 0x17, 0x3d, 0x2c, 0x5f, 0xfc, 0x52, 0x49, 0x47, 0x7d, 0x61, 0xed, 0xff, 0xfd, 0x66,
+    0x67, 0x29, 0x44, 0xbc, 0x02, 0x5a, 0x87, 0x79, 0x44, 0x67, 0x71, 0x01, 0x68, 0x1d,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800B[32] = {
+    0x3e, 0xc4, 0x9f, 0x3e, 0x33, 0x49, 0xaf, 0xc4, 0xff, 0xf6, 0x9a, 0x55, 0x8a, 0xdb, 0x4e, 0x4b,
+    0xd9, 0xd9, 0x72, 0xd1, 0x2e, 0xea, 0xe9, 0x03, 0x18, 0xc4, 0x82, 0x45, 0x2a, 0xd6, 0xc1, 0x9b,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_800B);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_800B);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_800B);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800C
+const uint8_t kDevelopmentDAC_Cert_FFF3_800C[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x51, 0xbd, 0xf9, 0xd2, 0xd5, 0x91,
+    0x4f, 0x40, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x43, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x43, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x56, 0xb6, 0xc9, 0xab, 0x24, 0x8f, 0x77, 0xe8,
+    0x81, 0xb9, 0xb3, 0xca, 0xa5, 0xbc, 0xf1, 0xca, 0x50, 0x2f, 0xe4, 0x01, 0xe6, 0x66, 0x14, 0x03, 0x36, 0x6a, 0x25, 0xfd, 0xe8,
+    0x36, 0x88, 0x6b, 0x3f, 0x80, 0x20, 0xd0, 0xa2, 0x2c, 0x6c, 0x48, 0xae, 0xaf, 0x7d, 0xac, 0x72, 0xef, 0x3f, 0xf5, 0x59, 0xcb,
+    0x61, 0x79, 0xda, 0xfa, 0x3b, 0xb2, 0x57, 0x1f, 0x84, 0x75, 0xd3, 0xda, 0xe5, 0x27, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x43, 0x6c, 0xdb, 0xb0,
+    0x06, 0x8e, 0xdb, 0xa6, 0xb0, 0xa8, 0x8a, 0xdb, 0x4c, 0xba, 0x56, 0xdb, 0x85, 0xbf, 0x30, 0x43, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xf7, 0x8d, 0xf8, 0x77, 0xdd, 0x6e, 0x45, 0xa5, 0x02, 0x00, 0xc6, 0x14, 0x37, 0x79, 0x8c,
+    0xdd, 0xda, 0xcd, 0xd2, 0xad, 0xa7, 0xdb, 0xb0, 0x03, 0x2c, 0x96, 0x85, 0xae, 0x43, 0xa7, 0x47, 0xf7, 0x02, 0x20, 0x34, 0x93,
+    0xfe, 0x70, 0xc5, 0x81, 0xb6, 0x97, 0xd9, 0x38, 0x89, 0x5c, 0x61, 0xad, 0x7f, 0xf6, 0x8c, 0x3a, 0x82, 0xa4, 0xdf, 0x8f, 0x00,
+    0xf9, 0x64, 0x3c, 0x44, 0x2b, 0xf2, 0x5d, 0xee, 0xd0,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_800C[65] = {
+    0x04, 0x56, 0xb6, 0xc9, 0xab, 0x24, 0x8f, 0x77, 0xe8, 0x81, 0xb9, 0xb3, 0xca, 0xa5, 0xbc, 0xf1, 0xca,
+    0x50, 0x2f, 0xe4, 0x01, 0xe6, 0x66, 0x14, 0x03, 0x36, 0x6a, 0x25, 0xfd, 0xe8, 0x36, 0x88, 0x6b, 0x3f,
+    0x80, 0x20, 0xd0, 0xa2, 0x2c, 0x6c, 0x48, 0xae, 0xaf, 0x7d, 0xac, 0x72, 0xef, 0x3f, 0xf5, 0x59, 0xcb,
+    0x61, 0x79, 0xda, 0xfa, 0x3b, 0xb2, 0x57, 0x1f, 0x84, 0x75, 0xd3, 0xda, 0xe5, 0x27,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800C[32] = {
+    0x43, 0x52, 0xe5, 0x9c, 0x06, 0x29, 0x7e, 0x0c, 0x37, 0xe6, 0xce, 0x34, 0x59, 0xcb, 0x99, 0x25,
+    0xde, 0x14, 0x9f, 0x3c, 0xd1, 0xe7, 0xa2, 0xc7, 0xd8, 0x84, 0xd0, 0xdf, 0x32, 0x57, 0x12, 0x81,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_800C);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_800C);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_800C);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800D
+const uint8_t kDevelopmentDAC_Cert_FFF3_800D[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x11, 0xc7, 0x1a, 0x31, 0x42, 0x22,
+    0x0d, 0xb6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x44, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xa3, 0x09, 0x17, 0xc3, 0x87, 0x70, 0x02, 0x5a,
+    0x86, 0x4a, 0x98, 0x1c, 0x0a, 0x78, 0x2b, 0x91, 0x9f, 0x95, 0xcc, 0x51, 0x34, 0xf8, 0x3f, 0x30, 0x2b, 0x36, 0x3a, 0xfe, 0x21,
+    0x61, 0x7c, 0x03, 0xd4, 0x30, 0x94, 0x32, 0xac, 0xa4, 0xde, 0x5e, 0x77, 0x13, 0x5d, 0x6a, 0xe8, 0x42, 0x13, 0xd5, 0x1c, 0x3f,
+    0x92, 0xf5, 0xfa, 0x81, 0x0d, 0xda, 0xe0, 0x19, 0xe5, 0x8d, 0x0e, 0x35, 0x96, 0x7c, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xa3, 0x2c, 0xf1, 0x79,
+    0x9a, 0x31, 0xd7, 0x70, 0x93, 0x20, 0x8d, 0xc1, 0x3b, 0x8a, 0xdf, 0xc5, 0x17, 0x2f, 0xc2, 0x0d, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x25, 0x86, 0xc3, 0xc2, 0x73, 0xdc, 0xbc, 0x05, 0x37, 0x7c, 0xdb, 0x13, 0x9c, 0x65, 0xf9, 0xbf,
+    0x05, 0xab, 0xe5, 0x0e, 0xb2, 0x03, 0x79, 0xb4, 0xee, 0x8d, 0x99, 0x58, 0xf4, 0x35, 0x2e, 0xd8, 0x02, 0x21, 0x00, 0xb1, 0xab,
+    0xc1, 0x55, 0x9d, 0x85, 0xcd, 0x57, 0x15, 0x2f, 0x9b, 0xec, 0x81, 0x90, 0xb5, 0xfa, 0x73, 0xe1, 0xab, 0x6f, 0x91, 0xb2, 0x31,
+    0x98, 0x0d, 0xad, 0x32, 0xb3, 0xe1, 0x56, 0x3a, 0xd8,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_800D[65] = {
+    0x04, 0xa3, 0x09, 0x17, 0xc3, 0x87, 0x70, 0x02, 0x5a, 0x86, 0x4a, 0x98, 0x1c, 0x0a, 0x78, 0x2b, 0x91,
+    0x9f, 0x95, 0xcc, 0x51, 0x34, 0xf8, 0x3f, 0x30, 0x2b, 0x36, 0x3a, 0xfe, 0x21, 0x61, 0x7c, 0x03, 0xd4,
+    0x30, 0x94, 0x32, 0xac, 0xa4, 0xde, 0x5e, 0x77, 0x13, 0x5d, 0x6a, 0xe8, 0x42, 0x13, 0xd5, 0x1c, 0x3f,
+    0x92, 0xf5, 0xfa, 0x81, 0x0d, 0xda, 0xe0, 0x19, 0xe5, 0x8d, 0x0e, 0x35, 0x96, 0x7c,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800D[32] = {
+    0x40, 0xd6, 0xec, 0xcb, 0x9d, 0x86, 0x4b, 0x35, 0xf2, 0xc0, 0x06, 0x42, 0x89, 0x8b, 0xac, 0x12,
+    0x18, 0xee, 0xf0, 0x62, 0x8f, 0xdd, 0xae, 0x71, 0x63, 0x14, 0x31, 0x8c, 0x05, 0x75, 0xed, 0x76,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_800D);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_800D);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_800D);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800E
+const uint8_t kDevelopmentDAC_Cert_FFF3_800E[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x28, 0x67, 0x07, 0x03, 0x8c, 0xe6,
+    0x6c, 0x62, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x45, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x45, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x46, 0x95, 0x23, 0x99, 0xd7, 0x4e, 0xd1, 0x8c,
+    0xb4, 0xd3, 0x0a, 0x8f, 0x81, 0x79, 0x07, 0x01, 0xa0, 0xb6, 0x08, 0x7f, 0x2e, 0x41, 0x59, 0x64, 0x4f, 0x10, 0x5c, 0x26, 0x74,
+    0x0a, 0x69, 0xca, 0x37, 0x96, 0x7e, 0xb8, 0x8f, 0x7b, 0xde, 0xb1, 0x7f, 0x8a, 0x5f, 0xba, 0x2f, 0x40, 0x4b, 0xad, 0xea, 0xc6,
+    0xba, 0xab, 0x4d, 0x32, 0x61, 0xda, 0x52, 0x28, 0x57, 0xca, 0x65, 0xd8, 0xb0, 0x0a, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x37, 0xb0, 0x60, 0x69,
+    0xda, 0x8f, 0x8e, 0xa3, 0x52, 0x70, 0x9e, 0x08, 0xce, 0xae, 0x65, 0x36, 0x12, 0x24, 0x1a, 0xca, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xd4, 0x96, 0x7d, 0x76, 0xcc, 0x66, 0x25, 0x8c, 0xae, 0x60, 0x94, 0x8d, 0xb5, 0x89, 0x87,
+    0xf1, 0x07, 0xf4, 0x80, 0x5e, 0x58, 0x1c, 0xcc, 0xb9, 0x17, 0xf1, 0xdb, 0x0d, 0x45, 0xff, 0x9e, 0x63, 0x02, 0x21, 0x00, 0x9c,
+    0xb5, 0xbc, 0xa3, 0x6a, 0x73, 0x7d, 0x08, 0x38, 0x00, 0xbf, 0x02, 0x90, 0x4e, 0xd5, 0xfa, 0x57, 0xce, 0xf3, 0x76, 0x5c, 0x47,
+    0x46, 0xe0, 0x1d, 0xfb, 0x2b, 0x40, 0xf2, 0x18, 0x2d, 0x32,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_800E[65] = {
+    0x04, 0x46, 0x95, 0x23, 0x99, 0xd7, 0x4e, 0xd1, 0x8c, 0xb4, 0xd3, 0x0a, 0x8f, 0x81, 0x79, 0x07, 0x01,
+    0xa0, 0xb6, 0x08, 0x7f, 0x2e, 0x41, 0x59, 0x64, 0x4f, 0x10, 0x5c, 0x26, 0x74, 0x0a, 0x69, 0xca, 0x37,
+    0x96, 0x7e, 0xb8, 0x8f, 0x7b, 0xde, 0xb1, 0x7f, 0x8a, 0x5f, 0xba, 0x2f, 0x40, 0x4b, 0xad, 0xea, 0xc6,
+    0xba, 0xab, 0x4d, 0x32, 0x61, 0xda, 0x52, 0x28, 0x57, 0xca, 0x65, 0xd8, 0xb0, 0x0a,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800E[32] = {
+    0x56, 0x5a, 0x17, 0x80, 0xbf, 0x51, 0x0a, 0x86, 0x7e, 0x9c, 0xce, 0xb3, 0xca, 0x29, 0x13, 0x24,
+    0xf0, 0xde, 0x7e, 0x4c, 0x0a, 0x8d, 0x23, 0xbe, 0x54, 0x92, 0x78, 0x78, 0x99, 0x6b, 0x3d, 0x4a,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_800E);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_800E);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_800E);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800F
+const uint8_t kDevelopmentDAC_Cert_FFF3_800F[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x29, 0xac, 0x64, 0x44, 0x09, 0x0d,
+    0x07, 0xf7, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x30, 0x46, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x46, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xd9, 0x79, 0x99, 0xf4, 0xaf, 0x8b, 0x34, 0x40,
+    0x79, 0x4e, 0x11, 0x3e, 0x3e, 0x7a, 0x77, 0x59, 0x6c, 0x58, 0x6c, 0x5a, 0x1a, 0x2f, 0x24, 0x6c, 0x2c, 0xf0, 0xfd, 0x7d, 0xe1,
+    0xcd, 0x14, 0xbc, 0xf9, 0x47, 0x01, 0xb0, 0x82, 0xf9, 0x5f, 0x09, 0xb4, 0x5e, 0x4d, 0xf3, 0x6c, 0x3b, 0x91, 0x68, 0xba, 0x71,
+    0x97, 0x97, 0x87, 0x91, 0x48, 0x65, 0xa3, 0x69, 0xbd, 0x39, 0x8d, 0xd0, 0x19, 0x5d, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x2f, 0xc2, 0xf9, 0x39,
+    0xdc, 0xd8, 0x29, 0x5b, 0x06, 0x47, 0x8d, 0xdc, 0xe9, 0xe2, 0x9f, 0x78, 0x98, 0x16, 0xb6, 0x93, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x0e, 0x07, 0xc9, 0x7d, 0x62, 0x31, 0x4a, 0xa7, 0x2c, 0x25, 0xf6, 0xd3, 0x9f, 0xcd, 0xea, 0x82,
+    0xd2, 0x9b, 0x3e, 0x3d, 0x65, 0x29, 0x85, 0x67, 0x94, 0xd2, 0xfc, 0xc0, 0x62, 0x38, 0x0f, 0xc8, 0x02, 0x20, 0x29, 0x98, 0x7f,
+    0x5b, 0xd8, 0x58, 0xae, 0xa9, 0xba, 0x7a, 0x65, 0xa7, 0x28, 0x01, 0x71, 0x10, 0x60, 0xaa, 0x91, 0x1f, 0x27, 0x2b, 0x77, 0x41,
+    0x9a, 0x66, 0xd1, 0x9e, 0xb7, 0x32, 0x0e, 0x82,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_800F[65] = {
+    0x04, 0xd9, 0x79, 0x99, 0xf4, 0xaf, 0x8b, 0x34, 0x40, 0x79, 0x4e, 0x11, 0x3e, 0x3e, 0x7a, 0x77, 0x59,
+    0x6c, 0x58, 0x6c, 0x5a, 0x1a, 0x2f, 0x24, 0x6c, 0x2c, 0xf0, 0xfd, 0x7d, 0xe1, 0xcd, 0x14, 0xbc, 0xf9,
+    0x47, 0x01, 0xb0, 0x82, 0xf9, 0x5f, 0x09, 0xb4, 0x5e, 0x4d, 0xf3, 0x6c, 0x3b, 0x91, 0x68, 0xba, 0x71,
+    0x97, 0x97, 0x87, 0x91, 0x48, 0x65, 0xa3, 0x69, 0xbd, 0x39, 0x8d, 0xd0, 0x19, 0x5d,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800F[32] = {
+    0xca, 0x0c, 0x93, 0xf8, 0x58, 0x6d, 0x0c, 0xef, 0xdc, 0xe2, 0xdd, 0x11, 0x93, 0xc2, 0xfb, 0x73,
+    0x8c, 0xb6, 0x99, 0xe0, 0x5f, 0x3a, 0xb6, 0x25, 0xe7, 0xf8, 0x4b, 0x72, 0x9e, 0xa8, 0xf0, 0x32,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_800F);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_800F);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_800F);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8010
+const uint8_t kDevelopmentDAC_Cert_FFF3_8010[468] = {
+    0x30, 0x82, 0x01, 0xd0, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x2d, 0x59, 0xc6, 0xb2, 0x2c, 0x99,
+    0x76, 0xee, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x30, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x33, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x30, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x69, 0x99, 0x80, 0x05, 0x76, 0xe1, 0xf4, 0xc5, 0x41, 0x6e, 0x39,
+    0x09, 0x2c, 0xf7, 0x60, 0x5c, 0x33, 0xd3, 0x2b, 0x73, 0x61, 0x2b, 0x3b, 0x7a, 0x49, 0x9f, 0x4b, 0x88, 0x0d, 0x16, 0x61, 0x7d,
+    0x16, 0x72, 0x44, 0x0c, 0x7a, 0xaf, 0xc4, 0xd1, 0x1d, 0x0b, 0x74, 0xd2, 0x99, 0x37, 0x03, 0x1d, 0x86, 0xa7, 0xa4, 0xf1, 0x56,
+    0x3b, 0xf5, 0x56, 0xff, 0xdf, 0xc3, 0xb9, 0xc6, 0xd7, 0x81, 0xd5, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x0b, 0x61, 0x97, 0x0d, 0x57, 0x3b, 0x61,
+    0x60, 0x0a, 0x25, 0x14, 0x2b, 0xc8, 0x7f, 0xb6, 0xd7, 0x4e, 0x31, 0x32, 0x6f, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6, 0x9b, 0x7e, 0x2c,
+    0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45,
+    0x02, 0x21, 0x00, 0xf5, 0xfd, 0x65, 0xe4, 0x61, 0xf8, 0x66, 0xd0, 0x72, 0x32, 0xae, 0x0b, 0xbd, 0x09, 0xe3, 0x46, 0xe8, 0x8b,
+    0x36, 0x10, 0xa5, 0x3f, 0x5f, 0x25, 0x3c, 0x88, 0x77, 0x45, 0xb1, 0xec, 0x5b, 0x9f, 0x02, 0x20, 0x64, 0x08, 0x63, 0xad, 0xbd,
+    0x5f, 0xd8, 0x59, 0x5c, 0xa6, 0xdf, 0x92, 0xe2, 0xce, 0x4e, 0xc0, 0x1b, 0x89, 0x17, 0xff, 0xce, 0x8b, 0xe2, 0x45, 0x72, 0x5f,
+    0x93, 0xae, 0xdc, 0xf6, 0x1a, 0x6a,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8010[65] = {
+    0x04, 0x69, 0x99, 0x80, 0x05, 0x76, 0xe1, 0xf4, 0xc5, 0x41, 0x6e, 0x39, 0x09, 0x2c, 0xf7, 0x60, 0x5c,
+    0x33, 0xd3, 0x2b, 0x73, 0x61, 0x2b, 0x3b, 0x7a, 0x49, 0x9f, 0x4b, 0x88, 0x0d, 0x16, 0x61, 0x7d, 0x16,
+    0x72, 0x44, 0x0c, 0x7a, 0xaf, 0xc4, 0xd1, 0x1d, 0x0b, 0x74, 0xd2, 0x99, 0x37, 0x03, 0x1d, 0x86, 0xa7,
+    0xa4, 0xf1, 0x56, 0x3b, 0xf5, 0x56, 0xff, 0xdf, 0xc3, 0xb9, 0xc6, 0xd7, 0x81, 0xd5,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8010[32] = {
+    0x58, 0x36, 0xf4, 0x2e, 0xaa, 0x87, 0x0a, 0x99, 0x8d, 0xbb, 0xff, 0x13, 0xfa, 0x8a, 0xb5, 0x49,
+    0xa7, 0xa8, 0xca, 0xac, 0x4e, 0x4c, 0x4e, 0x9d, 0x3f, 0x0d, 0x12, 0x1f, 0xf1, 0x7a, 0x43, 0xa0,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8010);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8010);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8010);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8011
+const uint8_t kDevelopmentDAC_Cert_FFF3_8011[468] = {
+    0x30, 0x82, 0x01, 0xd0, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x29, 0x44, 0x1d, 0xc6, 0x8f, 0x08,
+    0x85, 0xec, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x31, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x33, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x31, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xe1, 0x09, 0x2c, 0xfa, 0xfa, 0xd2, 0x97, 0x5f, 0xe2, 0x86, 0x4c,
+    0x29, 0xd7, 0x17, 0xf2, 0x06, 0x16, 0xfb, 0x7c, 0xfb, 0x83, 0xcf, 0x38, 0x1f, 0xfa, 0x6f, 0x80, 0x40, 0x41, 0x19, 0xfc, 0x08,
+    0x3b, 0x7c, 0xb0, 0xc2, 0x4e, 0x79, 0x33, 0x30, 0x90, 0x2b, 0x84, 0xe8, 0x1a, 0x4f, 0xb7, 0x40, 0xd5, 0xe1, 0x59, 0xad, 0xbd,
+    0x4b, 0x34, 0x4d, 0x5f, 0x2a, 0xe4, 0xf0, 0x4c, 0xd5, 0x97, 0x6e, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x1d, 0x29, 0xb3, 0xdb, 0xa1, 0x1b, 0x08,
+    0x1e, 0x76, 0x91, 0x0c, 0x64, 0x43, 0x81, 0x66, 0xca, 0x41, 0xe6, 0xd2, 0x54, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6, 0x9b, 0x7e, 0x2c,
+    0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45,
+    0x02, 0x21, 0x00, 0xf6, 0x09, 0x72, 0x66, 0x8d, 0xf9, 0xfb, 0x45, 0x02, 0x23, 0x21, 0x8b, 0x76, 0x35, 0x94, 0xb6, 0x02, 0xe7,
+    0x0d, 0x67, 0x18, 0x5d, 0x80, 0x5e, 0x88, 0xa8, 0x1e, 0x66, 0x6d, 0x6d, 0x76, 0x3d, 0x02, 0x20, 0x04, 0x86, 0x65, 0x57, 0x3b,
+    0x11, 0x12, 0xfb, 0xc3, 0x26, 0x32, 0x87, 0xbc, 0xf4, 0xd9, 0x61, 0x2d, 0x15, 0xbe, 0x3f, 0xfa, 0xe4, 0x02, 0x6f, 0x86, 0x9c,
+    0x8f, 0xeb, 0x87, 0x8c, 0x0d, 0x57,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8011[65] = {
+    0x04, 0xe1, 0x09, 0x2c, 0xfa, 0xfa, 0xd2, 0x97, 0x5f, 0xe2, 0x86, 0x4c, 0x29, 0xd7, 0x17, 0xf2, 0x06,
+    0x16, 0xfb, 0x7c, 0xfb, 0x83, 0xcf, 0x38, 0x1f, 0xfa, 0x6f, 0x80, 0x40, 0x41, 0x19, 0xfc, 0x08, 0x3b,
+    0x7c, 0xb0, 0xc2, 0x4e, 0x79, 0x33, 0x30, 0x90, 0x2b, 0x84, 0xe8, 0x1a, 0x4f, 0xb7, 0x40, 0xd5, 0xe1,
+    0x59, 0xad, 0xbd, 0x4b, 0x34, 0x4d, 0x5f, 0x2a, 0xe4, 0xf0, 0x4c, 0xd5, 0x97, 0x6e,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8011[32] = {
+    0x0c, 0x20, 0x6c, 0x34, 0xa2, 0x41, 0xe8, 0x27, 0x74, 0x8c, 0x41, 0xb6, 0x1e, 0x45, 0xee, 0x0e,
+    0xd5, 0xd7, 0x75, 0x5d, 0xbb, 0x6a, 0x28, 0xc2, 0x72, 0x72, 0x7d, 0xbf, 0xd6, 0x5e, 0x40, 0x1c,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8011);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8011);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8011);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8012
+const uint8_t kDevelopmentDAC_Cert_FFF3_8012[468] = {
+    0x30, 0x82, 0x01, 0xd0, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x68, 0xd0, 0xc1, 0x2e, 0x20, 0x59,
+    0xef, 0x6e, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x32, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x33, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x32, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x89, 0x6e, 0xf8, 0xac, 0x7c, 0x7a, 0x53, 0x13, 0x4f, 0xaf, 0x0a,
+    0x0a, 0x26, 0xf4, 0x61, 0x11, 0xa1, 0xba, 0xaa, 0xe9, 0x6e, 0x3c, 0xbb, 0x4c, 0xc2, 0x89, 0x78, 0x55, 0xce, 0xe2, 0x57, 0xa0,
+    0xf2, 0xc1, 0xad, 0x01, 0xb0, 0x5f, 0x7c, 0x78, 0x8d, 0x5a, 0x83, 0xdf, 0xf7, 0x52, 0x41, 0x33, 0xd7, 0x8c, 0x71, 0x0e, 0x63,
+    0xa2, 0x3d, 0x15, 0xf6, 0x45, 0xaf, 0x75, 0xac, 0x83, 0x4e, 0x38, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xde, 0x98, 0x5d, 0xcd, 0xfc, 0xce, 0xfc,
+    0x9a, 0xf2, 0xe7, 0x60, 0x0a, 0x2c, 0xbb, 0xbf, 0x67, 0x50, 0x91, 0xc3, 0xef, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6, 0x9b, 0x7e, 0x2c,
+    0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45,
+    0x02, 0x20, 0x6f, 0x07, 0x9b, 0x60, 0x6d, 0x37, 0x2a, 0x43, 0x92, 0x99, 0xee, 0x62, 0xef, 0x16, 0xd3, 0xa1, 0xb2, 0x39, 0x62,
+    0x4d, 0xd5, 0xc2, 0xd6, 0x2e, 0x31, 0x07, 0xc6, 0x34, 0x5e, 0xf9, 0xb1, 0x66, 0x02, 0x21, 0x00, 0xe5, 0x8b, 0x57, 0x07, 0xf0,
+    0x1c, 0x55, 0x4e, 0xa3, 0x02, 0xf0, 0x51, 0x27, 0x7d, 0x9f, 0xf8, 0x76, 0xa8, 0x51, 0x2c, 0x28, 0xde, 0x34, 0x02, 0xc5, 0x45,
+    0xf2, 0x38, 0xa2, 0xb6, 0x29, 0x00,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8012[65] = {
+    0x04, 0x89, 0x6e, 0xf8, 0xac, 0x7c, 0x7a, 0x53, 0x13, 0x4f, 0xaf, 0x0a, 0x0a, 0x26, 0xf4, 0x61, 0x11,
+    0xa1, 0xba, 0xaa, 0xe9, 0x6e, 0x3c, 0xbb, 0x4c, 0xc2, 0x89, 0x78, 0x55, 0xce, 0xe2, 0x57, 0xa0, 0xf2,
+    0xc1, 0xad, 0x01, 0xb0, 0x5f, 0x7c, 0x78, 0x8d, 0x5a, 0x83, 0xdf, 0xf7, 0x52, 0x41, 0x33, 0xd7, 0x8c,
+    0x71, 0x0e, 0x63, 0xa2, 0x3d, 0x15, 0xf6, 0x45, 0xaf, 0x75, 0xac, 0x83, 0x4e, 0x38,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8012[32] = {
+    0x76, 0xba, 0xc2, 0x14, 0xb9, 0xfa, 0xcb, 0x64, 0x31, 0xf3, 0x71, 0xa9, 0x33, 0xc0, 0x66, 0x4e,
+    0x95, 0x5c, 0xf6, 0x72, 0x8b, 0xe0, 0xa7, 0xe7, 0x20, 0x2f, 0x33, 0x12, 0xd3, 0xd2, 0x21, 0x6a,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8012);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8012);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8012);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8013
+const uint8_t kDevelopmentDAC_Cert_FFF3_8013[469] = {
+    0x30, 0x82, 0x01, 0xd1, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x58, 0xfc, 0xf0, 0x19, 0xc4, 0x86,
+    0x43, 0x47, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x33, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x33, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x33, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x9b, 0x9e, 0x47, 0x4a, 0x8d, 0x90, 0x66, 0xdb, 0x89, 0xf9, 0xf6,
+    0xda, 0xc4, 0xe3, 0xaa, 0x2b, 0xca, 0x9f, 0x4a, 0x0b, 0xa1, 0x6c, 0x05, 0x6b, 0x3a, 0x0e, 0x3c, 0x12, 0xbb, 0x81, 0x14, 0x68,
+    0x0e, 0xc7, 0x34, 0x48, 0x73, 0xb0, 0xec, 0x61, 0x88, 0x84, 0x8d, 0x7c, 0xa8, 0x8f, 0x4d, 0xd9, 0xad, 0xeb, 0xab, 0x0a, 0x81,
+    0x5c, 0xdb, 0x01, 0xa0, 0xae, 0x12, 0x57, 0xb6, 0x8a, 0xb7, 0x2c, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x47, 0xc0, 0x60, 0x71, 0x53, 0xc8, 0x27,
+    0x95, 0x40, 0x18, 0x7b, 0x99, 0x8e, 0xfc, 0x6c, 0x46, 0xcc, 0x15, 0x45, 0xba, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6, 0x9b, 0x7e, 0x2c,
+    0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49, 0x00, 0x30, 0x46,
+    0x02, 0x21, 0x00, 0xbe, 0xef, 0x45, 0xe2, 0x8d, 0x8a, 0x24, 0x38, 0x40, 0x42, 0x55, 0xda, 0x41, 0xe8, 0x19, 0xd1, 0xf0, 0x81,
+    0x4d, 0x52, 0x05, 0x4c, 0x6e, 0x9b, 0x50, 0xb9, 0x1e, 0xf1, 0xb3, 0xdb, 0x18, 0x42, 0x02, 0x21, 0x00, 0x81, 0xef, 0x8e, 0xc5,
+    0xb0, 0x3c, 0x88, 0x1e, 0x89, 0x32, 0xc9, 0x6c, 0x52, 0xac, 0xeb, 0x06, 0x49, 0xa7, 0x19, 0x95, 0xf1, 0x20, 0x2d, 0x42, 0xa8,
+    0x4c, 0xb0, 0x5c, 0xe9, 0x34, 0x03, 0xc3,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8013[65] = {
+    0x04, 0x9b, 0x9e, 0x47, 0x4a, 0x8d, 0x90, 0x66, 0xdb, 0x89, 0xf9, 0xf6, 0xda, 0xc4, 0xe3, 0xaa, 0x2b,
+    0xca, 0x9f, 0x4a, 0x0b, 0xa1, 0x6c, 0x05, 0x6b, 0x3a, 0x0e, 0x3c, 0x12, 0xbb, 0x81, 0x14, 0x68, 0x0e,
+    0xc7, 0x34, 0x48, 0x73, 0xb0, 0xec, 0x61, 0x88, 0x84, 0x8d, 0x7c, 0xa8, 0x8f, 0x4d, 0xd9, 0xad, 0xeb,
+    0xab, 0x0a, 0x81, 0x5c, 0xdb, 0x01, 0xa0, 0xae, 0x12, 0x57, 0xb6, 0x8a, 0xb7, 0x2c,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8013[32] = {
+    0x7b, 0x04, 0xbb, 0x86, 0x20, 0x68, 0xc1, 0xa1, 0x57, 0x72, 0xfd, 0x93, 0x4f, 0xfc, 0x6f, 0xdd,
+    0xe2, 0x87, 0x0b, 0x64, 0x62, 0x93, 0x40, 0xf5, 0xde, 0x76, 0xe9, 0x3a, 0xdb, 0x74, 0x1a, 0x6a,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8013);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8013);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8013);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8014
+const uint8_t kDevelopmentDAC_Cert_FFF3_8014[467] = {
+    0x30, 0x82, 0x01, 0xcf, 0x30, 0x82, 0x01, 0x76, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x4b, 0xf5, 0x18, 0x60, 0x25, 0x4b,
+    0x32, 0xd1, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3b, 0x31, 0x39, 0x30, 0x37, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x30, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x34, 0x20, 0x4d, 0x76, 0x69, 0x64, 0x3a, 0x46, 0x46, 0x46, 0x33, 0x20, 0x4d, 0x70, 0x69, 0x64, 0x3a,
+    0x38, 0x30, 0x31, 0x34, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xcd, 0x6f, 0xdf, 0xdf, 0xd5, 0x61, 0xe1, 0x4f, 0xd2, 0x83, 0x43,
+    0xdb, 0x45, 0x84, 0x3a, 0x00, 0xaf, 0x07, 0xf3, 0xae, 0xa9, 0xbf, 0xc1, 0x33, 0xf6, 0x8a, 0x14, 0xa3, 0x9e, 0x00, 0x13, 0x04,
+    0x4c, 0xdc, 0xc8, 0x3b, 0x9c, 0x9c, 0x98, 0xb8, 0x13, 0x6e, 0xea, 0x20, 0xa6, 0xd9, 0x65, 0x34, 0x60, 0xf4, 0x95, 0xc5, 0x74,
+    0x18, 0x68, 0xbc, 0xf6, 0x19, 0x37, 0x65, 0xd1, 0xc6, 0xee, 0x1e, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03,
+    0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xa5, 0x85, 0xda, 0x3e, 0x72, 0x6b, 0x13,
+    0xbe, 0x26, 0xce, 0x93, 0xa8, 0xb4, 0x3e, 0x38, 0xef, 0x19, 0x9d, 0xd4, 0x3c, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04,
+    0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6, 0x9b, 0x7e, 0x2c,
+    0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47, 0x00, 0x30, 0x44,
+    0x02, 0x20, 0x2d, 0x28, 0x97, 0xdb, 0x1f, 0x2d, 0xd2, 0x0a, 0x94, 0x92, 0x3e, 0x0f, 0x58, 0xea, 0xd6, 0x9a, 0xb0, 0x16, 0x94,
+    0x8c, 0x6c, 0x22, 0x31, 0x65, 0x44, 0xb2, 0x31, 0xa0, 0x57, 0x56, 0x42, 0x11, 0x02, 0x20, 0x30, 0x51, 0x2d, 0x22, 0xd9, 0x02,
+    0x3e, 0x20, 0x6e, 0x05, 0xdb, 0xd1, 0x05, 0xba, 0xf3, 0x89, 0x6f, 0xa1, 0x6a, 0xb0, 0xf0, 0xf4, 0x48, 0xc7, 0x9d, 0x08, 0x66,
+    0x99, 0xb2, 0xd7, 0x5f, 0xf4,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8014[65] = {
+    0x04, 0xcd, 0x6f, 0xdf, 0xdf, 0xd5, 0x61, 0xe1, 0x4f, 0xd2, 0x83, 0x43, 0xdb, 0x45, 0x84, 0x3a, 0x00,
+    0xaf, 0x07, 0xf3, 0xae, 0xa9, 0xbf, 0xc1, 0x33, 0xf6, 0x8a, 0x14, 0xa3, 0x9e, 0x00, 0x13, 0x04, 0x4c,
+    0xdc, 0xc8, 0x3b, 0x9c, 0x9c, 0x98, 0xb8, 0x13, 0x6e, 0xea, 0x20, 0xa6, 0xd9, 0x65, 0x34, 0x60, 0xf4,
+    0x95, 0xc5, 0x74, 0x18, 0x68, 0xbc, 0xf6, 0x19, 0x37, 0x65, 0xd1, 0xc6, 0xee, 0x1e,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8014[32] = {
+    0xf2, 0x8d, 0x1f, 0x07, 0xe4, 0x91, 0xbf, 0x72, 0xea, 0x78, 0xea, 0x48, 0xc4, 0x3a, 0x5f, 0xe5,
+    0x4f, 0x97, 0x01, 0x6c, 0xec, 0x6a, 0x51, 0xca, 0xda, 0xa4, 0x4f, 0x23, 0xee, 0xa0, 0xad, 0x5c,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8014);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8014);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8014);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8015
+const uint8_t kDevelopmentDAC_Cert_FFF3_8015[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x41, 0x10, 0xa2, 0xb1, 0xfe, 0xca,
+    0xcd, 0x35, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x35, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x35, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x07, 0xdb, 0x8a, 0x8d, 0xff, 0x6f, 0x8b, 0xe4,
+    0x76, 0x01, 0x50, 0x4b, 0x17, 0xb3, 0x27, 0x83, 0x8e, 0xe1, 0x99, 0x60, 0x92, 0x32, 0x96, 0xf2, 0xeb, 0x95, 0x6a, 0x03, 0xce,
+    0x74, 0x59, 0x3e, 0xad, 0x45, 0xcc, 0x57, 0x88, 0x87, 0x24, 0x08, 0xa0, 0x1e, 0xa9, 0xc9, 0xe2, 0xe2, 0x6c, 0x4c, 0x2d, 0x41,
+    0x52, 0x46, 0xb8, 0xbe, 0x49, 0xcd, 0xec, 0xbd, 0xda, 0x7c, 0x06, 0xf9, 0x7b, 0x31, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x2d, 0xfd, 0x33, 0x2c,
+    0x8d, 0xc3, 0x67, 0xbf, 0xba, 0xca, 0xa6, 0xc6, 0xee, 0xf5, 0xb1, 0xf1, 0xfe, 0xbb, 0xb3, 0x5d, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x7d, 0x0f, 0x98, 0xde, 0x80, 0xfa, 0x52, 0x5a, 0x23, 0x29, 0xea, 0xe2, 0x65, 0xa8, 0x5f, 0x9b,
+    0x9c, 0x8c, 0x05, 0x17, 0x16, 0x76, 0x9f, 0x0c, 0xf1, 0xc2, 0xb8, 0xd8, 0xa6, 0x3d, 0x54, 0x2a, 0x02, 0x21, 0x00, 0xe8, 0x5e,
+    0x64, 0x3a, 0x38, 0xc4, 0xef, 0x9a, 0xda, 0xe3, 0x03, 0xa4, 0xb6, 0xe6, 0xe8, 0x1d, 0xd2, 0xa2, 0xa8, 0x4e, 0x6f, 0xc1, 0xed,
+    0x10, 0x2b, 0x74, 0x61, 0x76, 0x50, 0x21, 0x52, 0x7b,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8015[65] = {
+    0x04, 0x07, 0xdb, 0x8a, 0x8d, 0xff, 0x6f, 0x8b, 0xe4, 0x76, 0x01, 0x50, 0x4b, 0x17, 0xb3, 0x27, 0x83,
+    0x8e, 0xe1, 0x99, 0x60, 0x92, 0x32, 0x96, 0xf2, 0xeb, 0x95, 0x6a, 0x03, 0xce, 0x74, 0x59, 0x3e, 0xad,
+    0x45, 0xcc, 0x57, 0x88, 0x87, 0x24, 0x08, 0xa0, 0x1e, 0xa9, 0xc9, 0xe2, 0xe2, 0x6c, 0x4c, 0x2d, 0x41,
+    0x52, 0x46, 0xb8, 0xbe, 0x49, 0xcd, 0xec, 0xbd, 0xda, 0x7c, 0x06, 0xf9, 0x7b, 0x31,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8015[32] = {
+    0xbf, 0xb2, 0x1f, 0x6a, 0x65, 0xd0, 0x1e, 0x29, 0x18, 0x2b, 0x70, 0x1d, 0x1d, 0x22, 0xea, 0xeb,
+    0x68, 0xb9, 0x0f, 0x68, 0xdd, 0x81, 0x8b, 0x85, 0xce, 0x2f, 0xb7, 0xf4, 0xc7, 0xa7, 0xc7, 0xb6,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8015);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8015);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8015);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8016
+const uint8_t kDevelopmentDAC_Cert_FFF3_8016[491] = {
+    0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x5e, 0x75, 0x46, 0xb6, 0xdc, 0xac,
+    0x9f, 0x34, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x36, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x36, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x3a, 0x54, 0xc0, 0xd8, 0xd8, 0xa9, 0x3b, 0xb6,
+    0x45, 0x02, 0xa3, 0xf3, 0x43, 0xde, 0xd8, 0xaa, 0x6c, 0x2d, 0xde, 0x2e, 0x74, 0xc8, 0x60, 0x05, 0xf0, 0xf7, 0x75, 0xa9, 0x96,
+    0xba, 0xfc, 0xe9, 0xaa, 0x08, 0xa4, 0x62, 0x2f, 0x82, 0x00, 0xe2, 0xfe, 0x7d, 0x5a, 0xd0, 0x84, 0x0e, 0x8b, 0x70, 0x86, 0x1f,
+    0x93, 0xe6, 0x1a, 0x18, 0x0b, 0x09, 0xfd, 0xa1, 0xf5, 0x7a, 0xff, 0x59, 0x6a, 0xa9, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x61, 0x9c, 0xe1, 0x3f,
+    0x76, 0x4b, 0x72, 0xac, 0x49, 0x72, 0x50, 0xd0, 0x66, 0xe7, 0xe7, 0x7d, 0xe8, 0x11, 0x0f, 0xb3, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
+    0x00, 0x30, 0x44, 0x02, 0x20, 0x1a, 0x73, 0x1c, 0x28, 0x4e, 0x4f, 0x44, 0x59, 0xb3, 0x81, 0xa5, 0x8f, 0x23, 0xd9, 0x4a, 0x1c,
+    0x74, 0xc1, 0xba, 0xef, 0x55, 0xf2, 0x91, 0x34, 0x19, 0x4a, 0xef, 0xfe, 0xbf, 0xbf, 0xfe, 0xe9, 0x02, 0x20, 0x61, 0x7c, 0x84,
+    0xf6, 0x1b, 0x48, 0x13, 0xcd, 0xcb, 0x34, 0x8d, 0xc1, 0x34, 0xa3, 0x08, 0xcd, 0xdd, 0x93, 0xd1, 0x26, 0x5f, 0x0f, 0xc0, 0x85,
+    0x47, 0xef, 0x4b, 0xc8, 0x0c, 0x5a, 0x4f, 0x32,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8016[65] = {
+    0x04, 0x3a, 0x54, 0xc0, 0xd8, 0xd8, 0xa9, 0x3b, 0xb6, 0x45, 0x02, 0xa3, 0xf3, 0x43, 0xde, 0xd8, 0xaa,
+    0x6c, 0x2d, 0xde, 0x2e, 0x74, 0xc8, 0x60, 0x05, 0xf0, 0xf7, 0x75, 0xa9, 0x96, 0xba, 0xfc, 0xe9, 0xaa,
+    0x08, 0xa4, 0x62, 0x2f, 0x82, 0x00, 0xe2, 0xfe, 0x7d, 0x5a, 0xd0, 0x84, 0x0e, 0x8b, 0x70, 0x86, 0x1f,
+    0x93, 0xe6, 0x1a, 0x18, 0x0b, 0x09, 0xfd, 0xa1, 0xf5, 0x7a, 0xff, 0x59, 0x6a, 0xa9,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8016[32] = {
+    0xe6, 0x77, 0x5e, 0xba, 0x60, 0x6b, 0x2c, 0x20, 0xf6, 0x11, 0x35, 0x86, 0xa8, 0xb4, 0x47, 0xe2,
+    0x14, 0x41, 0x7b, 0x52, 0x6a, 0xf4, 0xa8, 0xbf, 0x57, 0x71, 0x3d, 0x46, 0x84, 0x7d, 0x70, 0xfe,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8016);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8016);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8016);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8017
+const uint8_t kDevelopmentDAC_Cert_FFF3_8017[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x65, 0x2e, 0x7b, 0x0e, 0xcb, 0x0c,
+    0x71, 0x78, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x37, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x37, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x8e, 0xdf, 0x9e, 0x13, 0xd3, 0x3f, 0xc3, 0xd5,
+    0xe5, 0x24, 0x6e, 0xcd, 0x18, 0x63, 0x26, 0x1d, 0x45, 0xaf, 0x4c, 0x89, 0xe8, 0xcb, 0x4a, 0xc3, 0x6d, 0x37, 0xb2, 0x2e, 0x3c,
+    0x8f, 0x66, 0x48, 0x5d, 0x78, 0xe1, 0xf5, 0xf3, 0x68, 0x17, 0xeb, 0xe4, 0x5f, 0xab, 0x50, 0xff, 0x3f, 0x6e, 0x38, 0xa8, 0xa2,
+    0x3c, 0x2c, 0xc0, 0x53, 0x1d, 0x00, 0xac, 0xc7, 0xc8, 0x26, 0xa6, 0xb0, 0x33, 0x92, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x15, 0x90, 0x45, 0x6b,
+    0x13, 0xa1, 0x74, 0xaa, 0xcb, 0xcb, 0xd0, 0x1c, 0x0b, 0xba, 0x81, 0x77, 0x58, 0x9c, 0x25, 0xaa, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xcf, 0xcb, 0x48, 0x0f, 0x96, 0xe6, 0xb0, 0xac, 0x57, 0x27, 0xe5, 0x25, 0x67, 0x0b, 0x2c,
+    0xcd, 0x47, 0x18, 0x86, 0x45, 0xe9, 0xdb, 0x6d, 0xc7, 0x91, 0x3a, 0x6a, 0x34, 0x38, 0x3b, 0x1d, 0xc4, 0x02, 0x20, 0x27, 0x87,
+    0xee, 0x99, 0x86, 0x22, 0x82, 0xb2, 0x26, 0x94, 0x4d, 0xd3, 0x83, 0xb5, 0x6a, 0xb5, 0x50, 0xec, 0xbf, 0x0c, 0x2a, 0x22, 0xcf,
+    0x89, 0x7d, 0x56, 0x76, 0x4f, 0x90, 0x27, 0x05, 0x6d,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8017[65] = {
+    0x04, 0x8e, 0xdf, 0x9e, 0x13, 0xd3, 0x3f, 0xc3, 0xd5, 0xe5, 0x24, 0x6e, 0xcd, 0x18, 0x63, 0x26, 0x1d,
+    0x45, 0xaf, 0x4c, 0x89, 0xe8, 0xcb, 0x4a, 0xc3, 0x6d, 0x37, 0xb2, 0x2e, 0x3c, 0x8f, 0x66, 0x48, 0x5d,
+    0x78, 0xe1, 0xf5, 0xf3, 0x68, 0x17, 0xeb, 0xe4, 0x5f, 0xab, 0x50, 0xff, 0x3f, 0x6e, 0x38, 0xa8, 0xa2,
+    0x3c, 0x2c, 0xc0, 0x53, 0x1d, 0x00, 0xac, 0xc7, 0xc8, 0x26, 0xa6, 0xb0, 0x33, 0x92,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8017[32] = {
+    0x8d, 0x1b, 0x47, 0x41, 0x00, 0xee, 0x06, 0xd4, 0x3b, 0x7c, 0xba, 0x97, 0x2c, 0x26, 0x4b, 0xf8,
+    0x9e, 0xd6, 0xf6, 0xc5, 0xf1, 0x53, 0xe5, 0xab, 0x05, 0x89, 0x0d, 0x85, 0xb9, 0xc1, 0xd8, 0xc8,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8017);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8017);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8017);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8018
+const uint8_t kDevelopmentDAC_Cert_FFF3_8018[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x36, 0xe7, 0x37, 0xe2, 0x8c, 0x3c,
+    0xd2, 0xa0, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x38, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x38, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xf1, 0x2a, 0xed, 0xca, 0x3d, 0x84, 0x60, 0x6e,
+    0x74, 0x24, 0x8e, 0x44, 0xae, 0x78, 0x72, 0x19, 0x40, 0x98, 0xda, 0x6e, 0xbf, 0xbd, 0xa3, 0x31, 0x74, 0x90, 0x66, 0x6c, 0x8e,
+    0x91, 0x0f, 0xb8, 0xea, 0xa1, 0x4d, 0xc4, 0x38, 0x9a, 0xe5, 0xe6, 0xa6, 0x8b, 0x9b, 0xe9, 0x46, 0xa6, 0x52, 0xd7, 0xb3, 0x09,
+    0xeb, 0x96, 0x63, 0x02, 0xd5, 0x8e, 0x83, 0x35, 0x49, 0x30, 0xbe, 0x07, 0x5c, 0xe4, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x65, 0x0f, 0xcb, 0xe3,
+    0xf9, 0xbc, 0x15, 0xad, 0x53, 0xb9, 0xc0, 0x14, 0x5d, 0xd6, 0x40, 0x57, 0x96, 0x72, 0xe8, 0x41, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0x8f, 0xd4, 0x12, 0x07, 0x5c, 0x71, 0xb8, 0x3f, 0x93, 0x51, 0xfe, 0x0c, 0x88, 0x13, 0x15,
+    0x0e, 0xad, 0x19, 0xdb, 0xe9, 0x84, 0x7b, 0x76, 0x33, 0x54, 0x0f, 0x84, 0x63, 0x9b, 0xe0, 0xa3, 0xd9, 0x02, 0x20, 0x59, 0x45,
+    0x6e, 0x04, 0xf9, 0xfa, 0x4a, 0x30, 0x8c, 0x4a, 0x45, 0xdf, 0x07, 0x86, 0xd8, 0xc1, 0x2c, 0x97, 0xed, 0x0b, 0xf2, 0x32, 0xdc,
+    0xde, 0x44, 0x0a, 0xd8, 0x7b, 0x64, 0xb3, 0x86, 0xca,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8018[65] = {
+    0x04, 0xf1, 0x2a, 0xed, 0xca, 0x3d, 0x84, 0x60, 0x6e, 0x74, 0x24, 0x8e, 0x44, 0xae, 0x78, 0x72, 0x19,
+    0x40, 0x98, 0xda, 0x6e, 0xbf, 0xbd, 0xa3, 0x31, 0x74, 0x90, 0x66, 0x6c, 0x8e, 0x91, 0x0f, 0xb8, 0xea,
+    0xa1, 0x4d, 0xc4, 0x38, 0x9a, 0xe5, 0xe6, 0xa6, 0x8b, 0x9b, 0xe9, 0x46, 0xa6, 0x52, 0xd7, 0xb3, 0x09,
+    0xeb, 0x96, 0x63, 0x02, 0xd5, 0x8e, 0x83, 0x35, 0x49, 0x30, 0xbe, 0x07, 0x5c, 0xe4,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8018[32] = {
+    0x6b, 0xee, 0x75, 0x3d, 0xdf, 0xe4, 0xec, 0x95, 0x79, 0x40, 0xf7, 0xef, 0x0a, 0x5a, 0x26, 0x7f,
+    0xa8, 0xe3, 0x73, 0x44, 0xdd, 0x83, 0x96, 0x4a, 0xa6, 0x54, 0x32, 0x49, 0x10, 0xa5, 0x80, 0x0b,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8018);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8018);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8018);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8019
+const uint8_t kDevelopmentDAC_Cert_FFF3_8019[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x23, 0x02, 0xf5, 0x0f, 0x92, 0x5d,
+    0x63, 0x6a, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x39, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x39, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x4d, 0x0f, 0x58, 0xc2, 0xf2, 0x7f, 0x58, 0x95,
+    0x71, 0x29, 0x23, 0x88, 0x60, 0xf4, 0x66, 0x81, 0x79, 0xb0, 0xdf, 0x08, 0xdd, 0xe0, 0xf7, 0x00, 0xcc, 0x8c, 0x18, 0x68, 0x9d,
+    0xe0, 0x76, 0x93, 0x3f, 0xd0, 0xe2, 0x7f, 0x4e, 0xa5, 0x9e, 0x39, 0x0a, 0x9a, 0xea, 0x8f, 0x4d, 0x4b, 0x10, 0x02, 0x1d, 0x55,
+    0xdf, 0xf4, 0x05, 0xd5, 0xc0, 0xcc, 0x7d, 0xcd, 0xb1, 0x76, 0xe3, 0xf7, 0xf7, 0x47, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x18, 0x98, 0xad, 0xa0,
+    0x4c, 0xb5, 0x67, 0xc2, 0xfe, 0xe2, 0xaa, 0x80, 0x81, 0x16, 0x81, 0x64, 0x7b, 0x04, 0xa1, 0x56, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xec, 0x44, 0x18, 0x8c, 0xa9, 0x43, 0xca, 0x53, 0xd8, 0xf8, 0x97, 0x61, 0x1f, 0x54, 0xa6,
+    0x0e, 0x76, 0x4a, 0x15, 0xd5, 0xfb, 0x84, 0xd3, 0x3d, 0x50, 0x54, 0xa7, 0x1e, 0xfd, 0xab, 0x29, 0xbc, 0x02, 0x21, 0x00, 0xd0,
+    0x3b, 0x4e, 0xcc, 0x7c, 0xb5, 0x9a, 0x4f, 0x52, 0xc1, 0xa5, 0xa2, 0x94, 0x06, 0x3e, 0xef, 0xce, 0xc8, 0x84, 0x7a, 0x5a, 0xee,
+    0xeb, 0x33, 0x84, 0x02, 0x7a, 0x01, 0x52, 0x2d, 0x32, 0x65,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_8019[65] = {
+    0x04, 0x4d, 0x0f, 0x58, 0xc2, 0xf2, 0x7f, 0x58, 0x95, 0x71, 0x29, 0x23, 0x88, 0x60, 0xf4, 0x66, 0x81,
+    0x79, 0xb0, 0xdf, 0x08, 0xdd, 0xe0, 0xf7, 0x00, 0xcc, 0x8c, 0x18, 0x68, 0x9d, 0xe0, 0x76, 0x93, 0x3f,
+    0xd0, 0xe2, 0x7f, 0x4e, 0xa5, 0x9e, 0x39, 0x0a, 0x9a, 0xea, 0x8f, 0x4d, 0x4b, 0x10, 0x02, 0x1d, 0x55,
+    0xdf, 0xf4, 0x05, 0xd5, 0xc0, 0xcc, 0x7d, 0xcd, 0xb1, 0x76, 0xe3, 0xf7, 0xf7, 0x47,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8019[32] = {
+    0xe9, 0xc9, 0x20, 0x76, 0x52, 0xbe, 0x4e, 0x49, 0x95, 0xb9, 0x50, 0xf3, 0x00, 0x87, 0x12, 0x3b,
+    0x9f, 0x9e, 0xec, 0x41, 0x96, 0x5d, 0x00, 0xdf, 0x69, 0x49, 0x19, 0x56, 0xcb, 0xe5, 0xb0, 0x49,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_8019);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_8019);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_8019);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801A
+const uint8_t kDevelopmentDAC_Cert_FFF3_801A[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x52, 0x79, 0xf4, 0xa7, 0x8e, 0xd4,
+    0x62, 0xea, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x41, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x41, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x0d, 0x8d, 0x09, 0xca, 0x49, 0x9b, 0x9c, 0x68,
+    0x8c, 0x65, 0x0b, 0x23, 0xdb, 0xfc, 0xf7, 0x87, 0x48, 0xba, 0x9c, 0x52, 0xdd, 0x9b, 0x60, 0xa6, 0xfc, 0x24, 0xed, 0x41, 0x46,
+    0xa6, 0xc5, 0xf1, 0x35, 0xd3, 0xaa, 0xb9, 0x05, 0xc0, 0x90, 0xee, 0x13, 0x06, 0x23, 0xce, 0xa1, 0x3f, 0xf5, 0x27, 0x26, 0x0c,
+    0x40, 0x05, 0x0e, 0xca, 0xe5, 0x59, 0x71, 0x2d, 0xe4, 0xfc, 0x87, 0x91, 0x56, 0xb0, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x93, 0x7c, 0xe3, 0x97,
+    0x8c, 0xb5, 0x99, 0xe3, 0x26, 0xdf, 0xf3, 0xad, 0x2f, 0x09, 0x9b, 0xec, 0x1b, 0x0f, 0x50, 0x62, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xc7, 0x9b, 0x5b, 0xba, 0xc2, 0xa8, 0x0c, 0xa2, 0xbb, 0x65, 0x0d, 0x2c, 0xde, 0x0a, 0xb0,
+    0x4a, 0xc9, 0x27, 0x1f, 0x17, 0x72, 0x93, 0xc2, 0xb5, 0x64, 0xfe, 0xb6, 0x85, 0xb5, 0xfe, 0xa8, 0x8b, 0x02, 0x20, 0x08, 0x2d,
+    0x18, 0xac, 0xd8, 0xd3, 0xce, 0x0a, 0x72, 0xcd, 0x06, 0x81, 0x0f, 0x19, 0x57, 0xe4, 0x0f, 0xa3, 0xa7, 0x2b, 0x66, 0x54, 0x7a,
+    0xf1, 0xe0, 0xd3, 0x8a, 0x75, 0xa9, 0x82, 0x88, 0x24,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_801A[65] = {
+    0x04, 0x0d, 0x8d, 0x09, 0xca, 0x49, 0x9b, 0x9c, 0x68, 0x8c, 0x65, 0x0b, 0x23, 0xdb, 0xfc, 0xf7, 0x87,
+    0x48, 0xba, 0x9c, 0x52, 0xdd, 0x9b, 0x60, 0xa6, 0xfc, 0x24, 0xed, 0x41, 0x46, 0xa6, 0xc5, 0xf1, 0x35,
+    0xd3, 0xaa, 0xb9, 0x05, 0xc0, 0x90, 0xee, 0x13, 0x06, 0x23, 0xce, 0xa1, 0x3f, 0xf5, 0x27, 0x26, 0x0c,
+    0x40, 0x05, 0x0e, 0xca, 0xe5, 0x59, 0x71, 0x2d, 0xe4, 0xfc, 0x87, 0x91, 0x56, 0xb0,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801A[32] = {
+    0x71, 0x6d, 0xcb, 0x7a, 0xd3, 0x01, 0xba, 0x31, 0xd3, 0x1f, 0x1e, 0xfe, 0xa8, 0xa8, 0x94, 0x83,
+    0x61, 0xe3, 0x33, 0x4a, 0xc0, 0x45, 0x15, 0xba, 0xc6, 0xdc, 0xac, 0x92, 0x71, 0x23, 0x14, 0xa4,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_801A);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_801A);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_801A);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801B
+const uint8_t kDevelopmentDAC_Cert_FFF3_801B[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x3b, 0x9d, 0xc5, 0x70, 0x89, 0x62,
+    0xd5, 0x33, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x42, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x42, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x9a, 0x98, 0x0c, 0x44, 0x93, 0xbe, 0x44, 0x80,
+    0x05, 0xec, 0xad, 0x56, 0x5c, 0x93, 0xb6, 0x6b, 0x64, 0x08, 0x19, 0x6f, 0xe6, 0x0f, 0x43, 0x15, 0xab, 0x85, 0xe3, 0xb7, 0xdb,
+    0x82, 0xe0, 0xe2, 0x5d, 0x2e, 0x51, 0x76, 0x29, 0x98, 0x86, 0x4c, 0xb5, 0x06, 0xe9, 0xca, 0x6d, 0xae, 0xf4, 0x0d, 0x2d, 0x18,
+    0x28, 0xfe, 0x3b, 0xaf, 0x9c, 0xa0, 0x39, 0x37, 0x8e, 0x5c, 0x3c, 0xca, 0xe7, 0x27, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x54, 0xba, 0x43, 0x5c,
+    0x41, 0x77, 0x79, 0x55, 0x6c, 0xab, 0xfb, 0xa7, 0x9e, 0xc1, 0x18, 0x6a, 0x07, 0x05, 0xf2, 0xf4, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xe6, 0xf8, 0x25, 0xa2, 0x9f, 0x79, 0x34, 0x50, 0x5c, 0x6e, 0x21, 0xaf, 0xb7, 0x70, 0x73,
+    0xc9, 0xfb, 0xc6, 0xf7, 0x3f, 0x84, 0x61, 0xb4, 0x88, 0x14, 0xd3, 0xea, 0xf9, 0x44, 0x37, 0xa9, 0x21, 0x02, 0x21, 0x00, 0xe0,
+    0x9c, 0xac, 0xa0, 0x13, 0x96, 0x58, 0xfd, 0x7a, 0x5a, 0x00, 0x3d, 0x80, 0x7c, 0x6b, 0x8c, 0xf6, 0x69, 0xf3, 0x9f, 0xc4, 0xe1,
+    0x14, 0xf0, 0xac, 0x33, 0x32, 0x94, 0x1f, 0x63, 0x1f, 0x86,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_801B[65] = {
+    0x04, 0x9a, 0x98, 0x0c, 0x44, 0x93, 0xbe, 0x44, 0x80, 0x05, 0xec, 0xad, 0x56, 0x5c, 0x93, 0xb6, 0x6b,
+    0x64, 0x08, 0x19, 0x6f, 0xe6, 0x0f, 0x43, 0x15, 0xab, 0x85, 0xe3, 0xb7, 0xdb, 0x82, 0xe0, 0xe2, 0x5d,
+    0x2e, 0x51, 0x76, 0x29, 0x98, 0x86, 0x4c, 0xb5, 0x06, 0xe9, 0xca, 0x6d, 0xae, 0xf4, 0x0d, 0x2d, 0x18,
+    0x28, 0xfe, 0x3b, 0xaf, 0x9c, 0xa0, 0x39, 0x37, 0x8e, 0x5c, 0x3c, 0xca, 0xe7, 0x27,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801B[32] = {
+    0xb2, 0x7c, 0x03, 0xfe, 0x49, 0xfa, 0xe3, 0x42, 0x62, 0x50, 0x62, 0xac, 0x57, 0x93, 0x85, 0x49,
+    0x2d, 0x36, 0x2c, 0x68, 0x8a, 0x67, 0xd1, 0x1c, 0x36, 0x0e, 0x20, 0x81, 0x10, 0xde, 0x03, 0x89,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_801B);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_801B);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_801B);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801C
+const uint8_t kDevelopmentDAC_Cert_FFF3_801C[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x57, 0xab, 0x48, 0x1b, 0x8e, 0xbe,
+    0x58, 0x3e, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x43, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x43, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x5f, 0x16, 0x91, 0xf7, 0xfa, 0x9b, 0x1e, 0x1b,
+    0x55, 0x6d, 0x59, 0x52, 0x9e, 0x22, 0x1e, 0x79, 0x3f, 0xca, 0x3f, 0x96, 0x99, 0x39, 0x17, 0x5b, 0xcc, 0x4a, 0x6d, 0x1a, 0x60,
+    0xc5, 0x78, 0x27, 0x62, 0x31, 0x5f, 0xd3, 0xb5, 0x1e, 0x0c, 0xcd, 0x62, 0xf9, 0x55, 0x5a, 0xc0, 0xbe, 0x72, 0x23, 0x3f, 0x96,
+    0x18, 0x1c, 0x0c, 0x69, 0x01, 0x72, 0xc8, 0xd3, 0x01, 0x10, 0x90, 0x8a, 0x82, 0x49, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xb6, 0xc1, 0xec, 0x4c,
+    0x73, 0x0a, 0x38, 0x19, 0x46, 0x52, 0x5e, 0x2f, 0xc6, 0x6f, 0x6c, 0xe6, 0x94, 0x62, 0x86, 0x1a, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x20, 0x14, 0x90, 0xaa, 0x97, 0x4e, 0x05, 0x2a, 0x07, 0x18, 0x5e, 0x3b, 0x14, 0x58, 0x42, 0x56, 0x9a,
+    0xd6, 0xda, 0x25, 0x59, 0x1e, 0x03, 0x38, 0x87, 0x29, 0x38, 0xeb, 0xca, 0x03, 0x9a, 0xe9, 0x14, 0x02, 0x21, 0x00, 0xcb, 0xa2,
+    0x17, 0x19, 0xd9, 0x73, 0xea, 0xc0, 0x8c, 0x5f, 0xd7, 0xdd, 0xa0, 0x22, 0x80, 0xd3, 0x1f, 0x03, 0xd9, 0x3b, 0x1a, 0x2f, 0x6c,
+    0x43, 0x2e, 0x0e, 0x9f, 0x53, 0x32, 0xe4, 0x44, 0xb3,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_801C[65] = {
+    0x04, 0x5f, 0x16, 0x91, 0xf7, 0xfa, 0x9b, 0x1e, 0x1b, 0x55, 0x6d, 0x59, 0x52, 0x9e, 0x22, 0x1e, 0x79,
+    0x3f, 0xca, 0x3f, 0x96, 0x99, 0x39, 0x17, 0x5b, 0xcc, 0x4a, 0x6d, 0x1a, 0x60, 0xc5, 0x78, 0x27, 0x62,
+    0x31, 0x5f, 0xd3, 0xb5, 0x1e, 0x0c, 0xcd, 0x62, 0xf9, 0x55, 0x5a, 0xc0, 0xbe, 0x72, 0x23, 0x3f, 0x96,
+    0x18, 0x1c, 0x0c, 0x69, 0x01, 0x72, 0xc8, 0xd3, 0x01, 0x10, 0x90, 0x8a, 0x82, 0x49,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801C[32] = {
+    0x71, 0xc5, 0x34, 0x63, 0x3a, 0xce, 0xaf, 0x0d, 0x58, 0x68, 0x6a, 0x5c, 0x71, 0xb0, 0x73, 0xbc,
+    0x5f, 0xf3, 0x08, 0x01, 0x6b, 0x0b, 0x0c, 0x14, 0x95, 0x92, 0xa8, 0x80, 0x0d, 0x25, 0x02, 0xe3,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_801C);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_801C);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_801C);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801D
+const uint8_t kDevelopmentDAC_Cert_FFF3_801D[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x74, 0xc1, 0xe4, 0x88, 0x13, 0x4f,
+    0x28, 0xc4, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x44, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x64, 0x25, 0x72, 0x4b, 0x25, 0x86, 0xe7, 0xd0,
+    0xb1, 0xc1, 0xb0, 0x1b, 0x95, 0x9c, 0x00, 0xa0, 0x4d, 0x81, 0xb2, 0x64, 0x2b, 0x30, 0x58, 0x14, 0x28, 0x02, 0xec, 0x10, 0xaa,
+    0x2d, 0x2b, 0x40, 0xee, 0xa5, 0x29, 0x30, 0xf3, 0xbc, 0xee, 0x14, 0x19, 0x5c, 0x53, 0x09, 0xe8, 0x09, 0xd8, 0xa0, 0x38, 0x13,
+    0x72, 0x60, 0x16, 0x1b, 0xbb, 0xbe, 0x27, 0x67, 0x3b, 0x66, 0x57, 0xe0, 0x56, 0x19, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x9f, 0x77, 0x6f, 0xd0,
+    0x90, 0x3e, 0xa8, 0x91, 0x1a, 0x84, 0x93, 0x91, 0xb1, 0xd1, 0x4b, 0x90, 0x5f, 0x9e, 0xf6, 0x22, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xa6, 0xc6, 0xbc, 0xbd, 0x21, 0xf4, 0x94, 0x54, 0xb0, 0x73, 0xbb, 0x9e, 0x6f, 0xb5, 0xde,
+    0xf6, 0x2a, 0x6b, 0x25, 0x49, 0x45, 0xd5, 0xa5, 0xe2, 0x44, 0x0f, 0xfa, 0x13, 0xd2, 0x9b, 0xb1, 0x8b, 0x02, 0x20, 0x0d, 0x8c,
+    0xbb, 0x90, 0xaf, 0x94, 0xc3, 0xeb, 0xea, 0x43, 0xe8, 0x97, 0xf8, 0x10, 0x54, 0xff, 0xad, 0xc0, 0xc4, 0x7a, 0x50, 0x44, 0x94,
+    0x40, 0xef, 0x15, 0xe1, 0x44, 0xc8, 0x9b, 0xea, 0x1e,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_801D[65] = {
+    0x04, 0x64, 0x25, 0x72, 0x4b, 0x25, 0x86, 0xe7, 0xd0, 0xb1, 0xc1, 0xb0, 0x1b, 0x95, 0x9c, 0x00, 0xa0,
+    0x4d, 0x81, 0xb2, 0x64, 0x2b, 0x30, 0x58, 0x14, 0x28, 0x02, 0xec, 0x10, 0xaa, 0x2d, 0x2b, 0x40, 0xee,
+    0xa5, 0x29, 0x30, 0xf3, 0xbc, 0xee, 0x14, 0x19, 0x5c, 0x53, 0x09, 0xe8, 0x09, 0xd8, 0xa0, 0x38, 0x13,
+    0x72, 0x60, 0x16, 0x1b, 0xbb, 0xbe, 0x27, 0x67, 0x3b, 0x66, 0x57, 0xe0, 0x56, 0x19,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801D[32] = {
+    0x85, 0xb6, 0x9a, 0x1d, 0x72, 0xd4, 0xba, 0xa1, 0xce, 0xf4, 0x5f, 0x29, 0x05, 0x5b, 0xad, 0x83,
+    0xa2, 0x4c, 0x1c, 0x26, 0xf7, 0xa9, 0xae, 0x0f, 0x63, 0x9a, 0xbb, 0x6d, 0x52, 0x31, 0x4d, 0x05,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_801D);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_801D);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_801D);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801E
+const uint8_t kDevelopmentDAC_Cert_FFF3_801E[493] = {
+    0x30, 0x82, 0x01, 0xe9, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x2c, 0x97, 0xdf, 0xb5, 0x5a, 0x3a,
+    0xdf, 0x28, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x45, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x45, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xbf, 0xee, 0x5c, 0x14, 0x05, 0x11, 0x68, 0x54,
+    0xdb, 0xee, 0x31, 0x61, 0x1f, 0xad, 0x11, 0xe0, 0xf3, 0xf7, 0x28, 0x0f, 0x92, 0xec, 0x4a, 0x4a, 0xb3, 0xa8, 0xaa, 0x9a, 0xe5,
+    0x80, 0xab, 0xe0, 0xdf, 0x89, 0xd5, 0x1c, 0x7c, 0x64, 0x7d, 0x17, 0x85, 0x1d, 0xd0, 0x33, 0xb4, 0x3f, 0x6f, 0x30, 0x0f, 0xb1,
+    0xc5, 0x69, 0x38, 0xf3, 0xf1, 0x88, 0xe7, 0xd9, 0x2a, 0x06, 0xf8, 0x98, 0xdc, 0x15, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x0a, 0x9a, 0x6a, 0xfe,
+    0x10, 0x06, 0x3c, 0xa1, 0x2a, 0xd3, 0x1b, 0x3e, 0x9b, 0x06, 0xb0, 0x4a, 0xf5, 0x0d, 0xe0, 0x9c, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49,
+    0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xd2, 0x0f, 0x60, 0x95, 0x54, 0x17, 0x53, 0x2e, 0x3b, 0xe8, 0xce, 0x88, 0x74, 0x58, 0x5b,
+    0x46, 0xb7, 0x81, 0x0b, 0xb3, 0x5b, 0xcf, 0x8c, 0xbe, 0x6b, 0x35, 0xeb, 0x22, 0xc5, 0x83, 0xf7, 0x81, 0x02, 0x21, 0x00, 0x84,
+    0x83, 0x46, 0x78, 0x2e, 0x4c, 0x03, 0x48, 0x40, 0x1b, 0x28, 0x94, 0x11, 0x44, 0x17, 0xd3, 0x78, 0xc9, 0xc5, 0xc9, 0x7b, 0x21,
+    0x7c, 0x31, 0xe1, 0xff, 0x08, 0xfb, 0xbb, 0xcd, 0xb5, 0x40,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_801E[65] = {
+    0x04, 0xbf, 0xee, 0x5c, 0x14, 0x05, 0x11, 0x68, 0x54, 0xdb, 0xee, 0x31, 0x61, 0x1f, 0xad, 0x11, 0xe0,
+    0xf3, 0xf7, 0x28, 0x0f, 0x92, 0xec, 0x4a, 0x4a, 0xb3, 0xa8, 0xaa, 0x9a, 0xe5, 0x80, 0xab, 0xe0, 0xdf,
+    0x89, 0xd5, 0x1c, 0x7c, 0x64, 0x7d, 0x17, 0x85, 0x1d, 0xd0, 0x33, 0xb4, 0x3f, 0x6f, 0x30, 0x0f, 0xb1,
+    0xc5, 0x69, 0x38, 0xf3, 0xf1, 0x88, 0xe7, 0xd9, 0x2a, 0x06, 0xf8, 0x98, 0xdc, 0x15,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801E[32] = {
+    0x14, 0xc5, 0x7a, 0xe3, 0x38, 0x4e, 0x66, 0x7f, 0x7b, 0x09, 0x95, 0xef, 0x46, 0x26, 0x3a, 0x89,
+    0x60, 0x86, 0xa0, 0xf6, 0xef, 0x6e, 0x2e, 0xb0, 0xbc, 0x76, 0x9d, 0x9b, 0x66, 0xc0, 0xb2, 0x5d,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_801E);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_801E);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_801E);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801F
+const uint8_t kDevelopmentDAC_Cert_FFF3_801F[492] = {
+    0x30, 0x82, 0x01, 0xe8, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x4b, 0x8f, 0x95, 0x31, 0xfe, 0xe3,
+    0x4b, 0x53, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20,
+    0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06,
+    0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30,
+    0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32,
+    0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61,
+    0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x33, 0x2f, 0x30,
+    0x78, 0x38, 0x30, 0x31, 0x46, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01,
+    0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02,
+    0x02, 0x0c, 0x04, 0x38, 0x30, 0x31, 0x46, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
+    0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x26, 0x95, 0xb0, 0xfd, 0x7c, 0x5e, 0xb6, 0x2e,
+    0x21, 0xfb, 0xad, 0x3c, 0x58, 0x1c, 0x06, 0x67, 0x7b, 0x87, 0xa4, 0x3f, 0x9d, 0x92, 0x4d, 0x08, 0xb9, 0xf3, 0x39, 0x0a, 0xe1,
+    0x8c, 0x51, 0x7e, 0x07, 0x75, 0x25, 0x47, 0x08, 0xc7, 0xc5, 0x3e, 0x23, 0x14, 0x4b, 0x20, 0xde, 0xe1, 0xf3, 0x26, 0x9c, 0x95,
+    0x7e, 0xca, 0xab, 0x44, 0x1c, 0x0c, 0xf6, 0xa5, 0x4c, 0x7b, 0xa7, 0x74, 0x70, 0xb7, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06,
+    0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff,
+    0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x2c, 0x82, 0xf0, 0xcb,
+    0x2b, 0x7b, 0x6a, 0x95, 0xd5, 0x40, 0xf0, 0x0d, 0x23, 0x49, 0x0d, 0x4f, 0x33, 0xd2, 0x42, 0x53, 0x30, 0x1f, 0x06, 0x03, 0x55,
+    0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48,
+    0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xaf, 0xb1, 0x4b, 0x08, 0x61, 0x81, 0xde, 0xe5, 0x57, 0x58, 0xee, 0x53, 0x8a, 0x61, 0xac,
+    0x42, 0x2c, 0x84, 0x42, 0x95, 0x25, 0x3a, 0x81, 0x57, 0xcd, 0x25, 0x81, 0x7f, 0x9e, 0x53, 0xf7, 0x84, 0x02, 0x20, 0x7b, 0x60,
+    0x45, 0x4c, 0xd4, 0xfc, 0xe3, 0xcd, 0x2d, 0x55, 0xf6, 0x4e, 0x95, 0x49, 0x2e, 0x90, 0x7d, 0xf2, 0x56, 0x41, 0x7f, 0x1d, 0x1f,
+    0xd4, 0x40, 0x3e, 0x55, 0x4d, 0x77, 0x3f, 0xdc, 0x7e,
+};
+const uint8_t kDevelopmentDAC_PublicKey_FFF3_801F[65] = {
+    0x04, 0x26, 0x95, 0xb0, 0xfd, 0x7c, 0x5e, 0xb6, 0x2e, 0x21, 0xfb, 0xad, 0x3c, 0x58, 0x1c, 0x06, 0x67,
+    0x7b, 0x87, 0xa4, 0x3f, 0x9d, 0x92, 0x4d, 0x08, 0xb9, 0xf3, 0x39, 0x0a, 0xe1, 0x8c, 0x51, 0x7e, 0x07,
+    0x75, 0x25, 0x47, 0x08, 0xc7, 0xc5, 0x3e, 0x23, 0x14, 0x4b, 0x20, 0xde, 0xe1, 0xf3, 0x26, 0x9c, 0x95,
+    0x7e, 0xca, 0xab, 0x44, 0x1c, 0x0c, 0xf6, 0xa5, 0x4c, 0x7b, 0xa7, 0x74, 0x70, 0xb7,
+};
+const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801F[32] = {
+    0xcb, 0xd5, 0x46, 0xa2, 0x3a, 0x82, 0xb8, 0xf2, 0x61, 0x73, 0x93, 0xce, 0xa6, 0xcc, 0x6f, 0xc0,
+    0x86, 0x9b, 0x20, 0xed, 0x03, 0x0c, 0x84, 0x78, 0x6d, 0x58, 0x38, 0x85, 0x0b, 0x3c, 0xa7, 0x3f,
+};
+ByteSpan kDacCert       = ByteSpan(kDevelopmentDAC_Cert_FFF3_801F);
+ByteSpan kDacPrivateKey = ByteSpan(kDevelopmentDAC_PrivateKey_FFF3_801F);
+ByteSpan kDacPublicKey  = ByteSpan(kDevelopmentDAC_PublicKey_FFF3_801F);
+#endif
 } // namespace DevelopmentCerts
 } // namespace chip
diff --git a/src/credentials/examples/ExampleDACs.h b/src/credentials/examples/ExampleDACs.h
index f380fda46c3bf3..014dd8577b8f17 100644
--- a/src/credentials/examples/ExampleDACs.h
+++ b/src/credentials/examples/ExampleDACs.h
@@ -14,6 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
+/**
+ * NOTE: This file is generated by src/tools/chip-cert/dacs.py.
+ */
 #pragma once
 #include <cstdint>
 
@@ -27,165 +31,485 @@ extern ByteSpan kDacCert;
 extern ByteSpan kDacPublicKey;
 extern ByteSpan kDacPrivateKey;
 
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8000
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8000
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8000[493];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8000[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8000[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8001
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8001
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8001[491];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8001[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8001[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8002
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8002
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8002[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8002[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8002[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8003
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8003
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8003[493];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8003[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8003[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8004
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8004
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8004[493];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8004[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8004[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8005
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8005
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8005[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8005[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8005[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8006
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8006
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8006[491];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8006[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8006[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8007
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8007
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8007[491];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8007[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8007[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8008
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8008
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8008[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8008[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8008[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8009
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8009
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8009[491];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8009[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8009[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800A
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800A
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_800A[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_800A[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_800A[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800B
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800B
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_800B[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_800B[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_800B[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800C
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800C
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_800C[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_800C[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_800C[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800D
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800D
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_800D[491];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_800D[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_800D[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800E
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800E
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_800E[491];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_800E[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_800E[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800F
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800F
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_800F[491];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_800F[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_800F[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8010
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8010
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8010[491];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8010[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8010[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8011
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8011
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8011[493];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8011[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8011[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8012
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8012
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8012[493];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8012[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8012[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8013
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8013
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8013[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8013[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8013[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8014
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8014
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8014[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8014[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8014[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8015
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8015
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8015[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8015[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8015[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8016
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8016
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8016[490];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8016[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8016[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8017
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8017
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8017[493];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8017[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8017[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8018
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8018
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8018[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8018[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8018[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8019
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8019
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_8019[493];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_8019[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_8019[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801A
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801A
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_801A[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_801A[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_801A[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801B
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801B
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_801B[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_801B[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_801B[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801C
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801C
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_801C[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_801C[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_801C[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801D
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801D
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_801D[493];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_801D[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_801D[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801E
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801E
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_801E[493];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_801E[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_801E[32];
 #endif
-#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801F
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801F
 extern const uint8_t kDevelopmentDAC_Cert_FFF1_801F[492];
 extern const uint8_t kDevelopmentDAC_PublicKey_FFF1_801F[65];
 extern const uint8_t kDevelopmentDAC_PrivateKey_FFF1_801F[32];
 #endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8000
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8000[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8000[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8000[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8001
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8001[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8001[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8001[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8002
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8002[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8002[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8002[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8003
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8003[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8003[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8003[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8004
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8004[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8004[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8004[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8005
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8005[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8005[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8005[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8006
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8006[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8006[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8006[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8007
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8007[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8007[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8007[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8008
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8008[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8008[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8008[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8009
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8009[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8009[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8009[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800A
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_800A[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_800A[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800A[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800B
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_800B[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_800B[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800B[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800C
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_800C[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_800C[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800C[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800D
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_800D[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_800D[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800D[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800E
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_800E[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_800E[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800E[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800F
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_800F[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_800F[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_800F[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8010
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8010[468];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8010[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8010[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8011
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8011[468];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8011[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8011[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8012
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8012[467];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8012[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8012[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8013
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8013[467];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8013[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8013[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8014
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8014[468];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8014[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8014[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8015
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8015[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8015[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8015[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8016
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8016[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8016[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8016[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8017
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8017[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8017[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8017[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8018
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8018[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8018[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8018[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8019
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_8019[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_8019[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_8019[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801A
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_801A[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_801A[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801A[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801B
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_801B[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_801B[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801B[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801C
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_801C[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_801C[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801C[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801D
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_801D[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_801D[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801D[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801E
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_801E[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_801E[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801E[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801F
+extern const uint8_t kDevelopmentDAC_Cert_FFF2_801F[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF2_801F[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF2_801F[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8000
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8000[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8000[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8000[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8001
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8001[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8001[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8001[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8002
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8002[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8002[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8002[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8003
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8003[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8003[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8003[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8004
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8004[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8004[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8004[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8005
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8005[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8005[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8005[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8006
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8006[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8006[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8006[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8007
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8007[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8007[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8007[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8008
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8008[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8008[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8008[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8009
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8009[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8009[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8009[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800A
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_800A[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_800A[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800A[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800B
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_800B[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_800B[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800B[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800C
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_800C[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_800C[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800C[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800D
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_800D[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_800D[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800D[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800E
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_800E[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_800E[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800E[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x800F
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_800F[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_800F[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_800F[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8010
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8010[468];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8010[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8010[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8011
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8011[468];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8011[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8011[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8012
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8012[468];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8012[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8012[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8013
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8013[469];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8013[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8013[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8014
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8014[467];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8014[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8014[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8015
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8015[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8015[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8015[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8016
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8016[491];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8016[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8016[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8017
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8017[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8017[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8017[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8018
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8018[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8018[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8018[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x8019
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_8019[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_8019[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_8019[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801A
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_801A[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_801A[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801A[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801B
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_801B[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_801B[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801B[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801C
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_801C[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_801C[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801C[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801D
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_801D[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_801D[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801D[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801E
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_801E[493];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_801E[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801E[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3 && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x801F
+extern const uint8_t kDevelopmentDAC_Cert_FFF3_801F[492];
+extern const uint8_t kDevelopmentDAC_PublicKey_FFF3_801F[65];
+extern const uint8_t kDevelopmentDAC_PrivateKey_FFF3_801F[32];
+#endif
 } // namespace DevelopmentCerts
 } // namespace chip
diff --git a/src/credentials/examples/ExamplePAI.cpp b/src/credentials/examples/ExamplePAI.cpp
index 6f484464a24172..a4ccb28e985d43 100644
--- a/src/credentials/examples/ExamplePAI.cpp
+++ b/src/credentials/examples/ExamplePAI.cpp
@@ -14,6 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
+/**
+ * NOTE: This file is generated by src/tools/chip-cert/dacs.py.
+ */
 #include "ExamplePAI.h"
 
 #include <cstdint>
@@ -24,6 +28,7 @@
 namespace chip {
 namespace DevelopmentCerts {
 
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1
 const uint8_t kDevelopmentPAI_Cert_FFF1[463] = {
     0x30, 0x82, 0x01, 0xcb, 0x30, 0x82, 0x01, 0x71, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x56, 0xad, 0x82, 0x22, 0xad, 0x94,
     0x5b, 0x64, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x30, 0x31, 0x18, 0x30, 0x16, 0x06,
@@ -62,5 +67,82 @@ const uint8_t kDevelopmentPAI_PrivateKey_FFF1[32] = {
 ByteSpan kPaiCert       = ByteSpan(kDevelopmentPAI_Cert_FFF1);
 ByteSpan kPaiPrivateKey = ByteSpan(kDevelopmentPAI_PrivateKey_FFF1);
 ByteSpan kPaiPublicKey  = ByteSpan(kDevelopmentPAI_PublicKey_FFF1);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2
+const uint8_t kDevelopmentPAI_Cert_FFF2[441] = {
+    0x30, 0x82, 0x01, 0xb5, 0x30, 0x82, 0x01, 0x5b, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x3d, 0x58, 0xa3, 0xaa, 0x7f, 0x4e,
+    0xba, 0x94, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x1a, 0x31, 0x18, 0x30, 0x16, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x0f, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x54, 0x65, 0x73, 0x74, 0x20, 0x50, 0x41, 0x41,
+    0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30, 0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39,
+    0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03,
+    0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20, 0x30,
+    0x78, 0x46, 0x46, 0x46, 0x32, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01,
+    0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x32, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x04, 0x7a,
+    0x12, 0xc6, 0x20, 0xe1, 0x71, 0xa8, 0x0f, 0xea, 0x22, 0xf3, 0x6f, 0xfb, 0x1f, 0x6c, 0xdf, 0xcb, 0x9b, 0x80, 0x65, 0x66, 0x2b,
+    0xdb, 0xbd, 0x82, 0x8c, 0x45, 0xb8, 0xf9, 0xc3, 0x50, 0x47, 0xb9, 0x92, 0x50, 0x1e, 0x7d, 0x70, 0x54, 0xf8, 0x5c, 0x05, 0xab,
+    0xe2, 0xf7, 0xc7, 0x4b, 0xed, 0x9a, 0x7a, 0x37, 0xae, 0xe9, 0x03, 0x74, 0xcf, 0x63, 0x2f, 0x4b, 0x3d, 0x28, 0xa4, 0x0a, 0xa3,
+    0x66, 0x30, 0x64, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02,
+    0x01, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x01, 0x06, 0x30, 0x1d, 0x06,
+    0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xab, 0x5f, 0xa3, 0x3b, 0x39, 0xff, 0x28, 0xd7, 0x38, 0x0a, 0xbb, 0x56, 0x07,
+    0x37, 0x8f, 0xf0, 0xef, 0x7b, 0x8b, 0xd6, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x78,
+    0x5c, 0xe7, 0x05, 0xb8, 0x6b, 0x8f, 0x4e, 0x6f, 0xc7, 0x93, 0xaa, 0x60, 0xcb, 0x43, 0xea, 0x69, 0x68, 0x82, 0xd5, 0x30, 0x0a,
+    0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45, 0x02, 0x20, 0x33, 0x38, 0x04, 0x56,
+    0x73, 0xd8, 0x9e, 0x86, 0x18, 0x20, 0x60, 0xc0, 0xfa, 0xa4, 0x39, 0x9c, 0x3a, 0x9b, 0x9b, 0xb3, 0x12, 0x9e, 0xdf, 0x25, 0x89,
+    0x4c, 0xcc, 0xc3, 0xc9, 0x57, 0x2d, 0x09, 0x02, 0x21, 0x00, 0xc8, 0x2a, 0x2b, 0xec, 0xb5, 0x12, 0x4c, 0x4e, 0x42, 0xf4, 0x33,
+    0x4a, 0xdb, 0xf8, 0x70, 0x2a, 0xee, 0xb2, 0x3b, 0x03, 0x0e, 0xfd, 0xfc, 0xf4, 0x4c, 0xa1, 0x00, 0x4f, 0xc1, 0xc7, 0xc2, 0xe0,
+};
+const uint8_t kDevelopmentPAI_PublicKey_FFF2[65] = {
+    0x04, 0x04, 0x7a, 0x12, 0xc6, 0x20, 0xe1, 0x71, 0xa8, 0x0f, 0xea, 0x22, 0xf3, 0x6f, 0xfb, 0x1f, 0x6c,
+    0xdf, 0xcb, 0x9b, 0x80, 0x65, 0x66, 0x2b, 0xdb, 0xbd, 0x82, 0x8c, 0x45, 0xb8, 0xf9, 0xc3, 0x50, 0x47,
+    0xb9, 0x92, 0x50, 0x1e, 0x7d, 0x70, 0x54, 0xf8, 0x5c, 0x05, 0xab, 0xe2, 0xf7, 0xc7, 0x4b, 0xed, 0x9a,
+    0x7a, 0x37, 0xae, 0xe9, 0x03, 0x74, 0xcf, 0x63, 0x2f, 0x4b, 0x3d, 0x28, 0xa4, 0x0a,
+};
+const uint8_t kDevelopmentPAI_PrivateKey_FFF2[32] = {
+    0x4a, 0x82, 0x62, 0xe8, 0x86, 0x82, 0x85, 0x68, 0x7e, 0x8b, 0xa8, 0x65, 0x0b, 0x63, 0xe3, 0x0b,
+    0xa5, 0x06, 0x6c, 0xd2, 0x51, 0x9c, 0xa7, 0x58, 0x22, 0xdc, 0xa5, 0xd5, 0xde, 0xbf, 0x22, 0xc8,
+};
+ByteSpan kPaiCert       = ByteSpan(kDevelopmentPAI_Cert_FFF2);
+ByteSpan kPaiPrivateKey = ByteSpan(kDevelopmentPAI_PrivateKey_FFF2);
+ByteSpan kPaiPublicKey  = ByteSpan(kDevelopmentPAI_PublicKey_FFF2);
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3
+const uint8_t kDevelopmentPAI_Cert_FFF3[440] = {
+    0x30, 0x82, 0x01, 0xb4, 0x30, 0x82, 0x01, 0x5b, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x23, 0x58, 0x10, 0x1b, 0xf9, 0x4d,
+    0x71, 0xf9, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x1a, 0x31, 0x18, 0x30, 0x16, 0x06,
+    0x03, 0x55, 0x04, 0x03, 0x0c, 0x0f, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x54, 0x65, 0x73, 0x74, 0x20, 0x50, 0x41, 0x41,
+    0x30, 0x20, 0x17, 0x0d, 0x32, 0x33, 0x30, 0x33, 0x30, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x39, 0x39,
+    0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03,
+    0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20, 0x30,
+    0x78, 0x46, 0x46, 0x46, 0x33, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01,
+    0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x33, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xfa, 0xa9,
+    0x10, 0xd0, 0x3b, 0x54, 0xa0, 0x41, 0xcd, 0x7e, 0x3e, 0x10, 0x85, 0xc6, 0xea, 0x29, 0x93, 0x34, 0xe5, 0x22, 0xb6, 0x42, 0x3a,
+    0xc4, 0x90, 0x71, 0x0b, 0xd5, 0x4b, 0x32, 0x26, 0xbf, 0x13, 0x8b, 0xed, 0xf8, 0x5d, 0xed, 0xe1, 0x4b, 0x4f, 0xbb, 0xaf, 0x42,
+    0x88, 0x70, 0x66, 0x37, 0x96, 0x87, 0x1e, 0x89, 0xa1, 0x17, 0x8b, 0x2e, 0xd2, 0x08, 0x54, 0x9f, 0xb8, 0xe4, 0x99, 0x90, 0xa3,
+    0x66, 0x30, 0x64, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02,
+    0x01, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x01, 0x06, 0x30, 0x1d, 0x06,
+    0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x34, 0x97, 0x42, 0xe6, 0x15, 0x7f, 0x7f, 0xd0, 0x14, 0x9c, 0x55, 0x32, 0xb6,
+    0x9b, 0x7e, 0x2c, 0x88, 0xe4, 0xa7, 0x6b, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x78,
+    0x5c, 0xe7, 0x05, 0xb8, 0x6b, 0x8f, 0x4e, 0x6f, 0xc7, 0x93, 0xaa, 0x60, 0xcb, 0x43, 0xea, 0x69, 0x68, 0x82, 0xd5, 0x30, 0x0a,
+    0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47, 0x00, 0x30, 0x44, 0x02, 0x20, 0x7d, 0xb1, 0xa1, 0xe0,
+    0xfd, 0x76, 0xab, 0xdd, 0xff, 0x1d, 0x87, 0x83, 0x61, 0xb0, 0x11, 0x26, 0x7e, 0xd6, 0xe3, 0x22, 0x99, 0xbc, 0xa6, 0x37, 0x9a,
+    0x77, 0x21, 0xfb, 0x1c, 0x56, 0x02, 0xf7, 0x02, 0x20, 0x59, 0x09, 0x00, 0x5d, 0x3a, 0x9b, 0xda, 0xe9, 0x68, 0xb8, 0x45, 0xba,
+    0x5c, 0x10, 0x26, 0xc6, 0x01, 0x42, 0xa9, 0x40, 0x41, 0xf7, 0x70, 0xd5, 0x50, 0xc0, 0x52, 0xc5, 0xba, 0x14, 0x4f, 0xb2,
+};
+const uint8_t kDevelopmentPAI_PublicKey_FFF3[65] = {
+    0x04, 0xfa, 0xa9, 0x10, 0xd0, 0x3b, 0x54, 0xa0, 0x41, 0xcd, 0x7e, 0x3e, 0x10, 0x85, 0xc6, 0xea, 0x29,
+    0x93, 0x34, 0xe5, 0x22, 0xb6, 0x42, 0x3a, 0xc4, 0x90, 0x71, 0x0b, 0xd5, 0x4b, 0x32, 0x26, 0xbf, 0x13,
+    0x8b, 0xed, 0xf8, 0x5d, 0xed, 0xe1, 0x4b, 0x4f, 0xbb, 0xaf, 0x42, 0x88, 0x70, 0x66, 0x37, 0x96, 0x87,
+    0x1e, 0x89, 0xa1, 0x17, 0x8b, 0x2e, 0xd2, 0x08, 0x54, 0x9f, 0xb8, 0xe4, 0x99, 0x90,
+};
+const uint8_t kDevelopmentPAI_PrivateKey_FFF3[32] = {
+    0x77, 0x7b, 0x30, 0xbf, 0x7b, 0xaa, 0x5d, 0x5d, 0xc9, 0xca, 0x9d, 0x0b, 0x93, 0x01, 0xcb, 0x6f,
+    0xea, 0x0e, 0x92, 0x89, 0x6c, 0x97, 0x11, 0x68, 0xfc, 0x95, 0xfc, 0xad, 0x86, 0x54, 0x45, 0x88,
+};
+ByteSpan kPaiCert       = ByteSpan(kDevelopmentPAI_Cert_FFF3);
+ByteSpan kPaiPrivateKey = ByteSpan(kDevelopmentPAI_PrivateKey_FFF3);
+ByteSpan kPaiPublicKey  = ByteSpan(kDevelopmentPAI_PublicKey_FFF3);
+#endif
 } // namespace DevelopmentCerts
 } // namespace chip
diff --git a/src/credentials/examples/ExamplePAI.h b/src/credentials/examples/ExamplePAI.h
index 9f0bbbb01ba282..f08c0b1697a5a2 100644
--- a/src/credentials/examples/ExamplePAI.h
+++ b/src/credentials/examples/ExamplePAI.h
@@ -14,6 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
+/**
+ * NOTE: This file is generated by src/tools/chip-cert/dacs.py.
+ */
 #pragma once
 #include <cstdint>
 
@@ -23,12 +27,24 @@
 namespace chip {
 namespace DevelopmentCerts {
 
-extern const uint8_t kDevelopmentPAI_Cert_FFF1[463];
-extern const uint8_t kDevelopmentPAI_PublicKey_FFF1[65];
-extern const uint8_t kDevelopmentPAI_PrivateKey_FFF1[32];
 extern ByteSpan kPaiCert;
 extern ByteSpan kPaiPublicKey;
 extern ByteSpan kPaiPrivateKey;
 
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF1
+extern const uint8_t kDevelopmentPAI_Cert_FFF1[463];
+extern const uint8_t kDevelopmentPAI_PublicKey_FFF1[65];
+extern const uint8_t kDevelopmentPAI_PrivateKey_FFF1[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2
+extern const uint8_t kDevelopmentPAI_Cert_FFF2[441];
+extern const uint8_t kDevelopmentPAI_PublicKey_FFF2[65];
+extern const uint8_t kDevelopmentPAI_PrivateKey_FFF2[32];
+#endif
+#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3
+extern const uint8_t kDevelopmentPAI_Cert_FFF3[440];
+extern const uint8_t kDevelopmentPAI_PublicKey_FFF3[65];
+extern const uint8_t kDevelopmentPAI_PrivateKey_FFF3[32];
+#endif
 } // namespace DevelopmentCerts
 } // namespace chip
diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h
index 27a92eeeeb339f..5098c5a167e8f4 100644
--- a/src/include/platform/DiagnosticDataProvider.h
+++ b/src/include/platform/DiagnosticDataProvider.h
@@ -158,7 +158,7 @@ class DiagnosticDataProvider
      */
     virtual CHIP_ERROR GetWiFiBssId(ByteSpan & value);
     virtual CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType);
-    virtual CHIP_ERROR GetWiFiVersion(uint8_t & wiFiVersion);
+    virtual CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion);
     virtual CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber);
     virtual CHIP_ERROR GetWiFiRssi(int8_t & rssi);
     virtual CHIP_ERROR GetWiFiBeaconLostCount(uint32_t & beaconLostCount);
@@ -339,7 +339,7 @@ DiagnosticDataProvider::GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostic
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
-inline CHIP_ERROR DiagnosticDataProvider::GetWiFiVersion(uint8_t & wiFiVersion)
+inline CHIP_ERROR DiagnosticDataProvider::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion)
 {
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
diff --git a/src/lib/core/tests/BUILD.gn b/src/lib/core/tests/BUILD.gn
index 295f7a337d09dd..ec83bc715411c1 100644
--- a/src/lib/core/tests/BUILD.gn
+++ b/src/lib/core/tests/BUILD.gn
@@ -37,6 +37,7 @@ chip_test_suite("tests") {
   public_deps = [
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support:testing",
+    "${chip_root}/src/platform",
     "${nlunit_test_root}:nlunit-test",
   ]
 }
diff --git a/src/platform/Ameba/DiagnosticDataProviderImpl.cpp b/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
index 5a272040fac48a..c869aee8d09f2d 100644
--- a/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
@@ -270,10 +270,11 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(ByteSpan & BssId)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wifiVersion)
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion)
 {
     // Support 802.11a/n Wi-Fi in AmebaD chipset
-    wifiVersion = to_underlying(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kN);
+    // TODO: https://github.com/project-chip/connectedhomeip/issues/25542
+    wifiVersion = app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kN;
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/platform/Ameba/DiagnosticDataProviderImpl.h b/src/platform/Ameba/DiagnosticDataProviderImpl.h
index 83484c1dfd5419..e4fedb659c9912 100644
--- a/src/platform/Ameba/DiagnosticDataProviderImpl.h
+++ b/src/platform/Ameba/DiagnosticDataProviderImpl.h
@@ -56,7 +56,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     CHIP_ERROR GetWiFiBssId(ByteSpan & BssId) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
-    CHIP_ERROR GetWiFiVersion(uint8_t & wifiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion) override;
     CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber) override;
     CHIP_ERROR GetWiFiRssi(int8_t & rssi) override;
     CHIP_ERROR GetWiFiBeaconLostCount(uint32_t & beaconLostCount) override;
diff --git a/src/platform/Ameba/Logging.cpp b/src/platform/Ameba/Logging.cpp
index 5bd55a72e94b37..edafd0f8a962e6 100644
--- a/src/platform/Ameba/Logging.cpp
+++ b/src/platform/Ameba/Logging.cpp
@@ -25,18 +25,30 @@
 #include <platform/logging/LogV.h>
 
 #include <core/CHIPConfig.h>
+#include <support/TypeTraits.h>
 #include <support/logging/Constants.h>
 
+#include "Logging.h"
 #include <stdio.h>
 
-#ifdef LOG_LOCAL_LEVEL
-#undef LOG_LOCAL_LEVEL
-#endif
-
 namespace chip {
 namespace Logging {
 namespace Platform {
 
+namespace {
+LogLevel log_level = LogLevel::kDetail;
+}
+
+void LogSetLevel(LogLevel level)
+{
+    log_level = level;
+}
+
+LogLevel LogGetLevel()
+{
+    return log_level;
+}
+
 void LogV(const char * module, uint8_t category, const char * msg, va_list v)
 {
     char tag[11];
@@ -50,14 +62,17 @@ void LogV(const char * module, uint8_t category, const char * msg, va_list v)
     switch (category)
     {
     case kLogCategory_Error:
-        printf("%s %s\r\n", tag, formattedMsg);
+        if (to_underlying(log_level) >= to_underlying(LogLevel::kError))
+            printf("%s %s\r\n", tag, formattedMsg);
         break;
     case kLogCategory_Progress:
     default:
-        printf("%s %s\r\n", tag, formattedMsg);
+        if (to_underlying(log_level) >= to_underlying(LogLevel::kProgress))
+            printf("%s %s\r\n", tag, formattedMsg);
         break;
     case kLogCategory_Detail:
-        printf("%s %s\r\n", tag, formattedMsg);
+        if (to_underlying(log_level) >= to_underlying(LogLevel::kDetail))
+            printf("%s %s\r\n", tag, formattedMsg);
         break;
     }
 }
diff --git a/src/platform/Ameba/Logging.h b/src/platform/Ameba/Logging.h
new file mode 100644
index 00000000000000..dca1bed9d6aa6e
--- /dev/null
+++ b/src/platform/Ameba/Logging.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <platform_stdlib.h>
+
+namespace chip {
+namespace Logging {
+namespace Platform {
+
+enum class LogLevel
+{
+    kError,
+    kProgress,
+    kDetail,
+};
+
+void LogSetLevel(LogLevel level);
+LogLevel LogGetLevel();
+
+} // namespace Platform
+} // namespace Logging
+} // namespace chip
diff --git a/src/platform/Beken/DiagnosticDataProviderImpl.cpp b/src/platform/Beken/DiagnosticDataProviderImpl.cpp
index f8cb5c584800e8..2c08da4cbcd081 100644
--- a/src/platform/Beken/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Beken/DiagnosticDataProviderImpl.cpp
@@ -170,10 +170,11 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(ByteSpan & BssId)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wifiVersion)
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion)
 {
     // Support 802.11a/n Wi-Fi in Beken chipset
-    wiFiVersion = to_underlying(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kN);
+    // TODO: https://github.com/project-chip/connectedhomeip/issues/25543
+    wiFiVersion = app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kN;
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/platform/Beken/DiagnosticDataProviderImpl.h b/src/platform/Beken/DiagnosticDataProviderImpl.h
index ecae313ea1643e..5e47df4e04a8f0 100644
--- a/src/platform/Beken/DiagnosticDataProviderImpl.h
+++ b/src/platform/Beken/DiagnosticDataProviderImpl.h
@@ -52,7 +52,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     CHIP_ERROR GetWiFiBssId(ByteSpan & BssId) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
-    CHIP_ERROR GetWiFiVersion(uint8_t & wifiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion) override;
     CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber) override;
     CHIP_ERROR GetWiFiRssi(int8_t & rssi) override;
     CHIP_ERROR GetWiFiBeaconLostCount(uint32_t & beaconLostCount) override;
diff --git a/src/platform/Darwin/BleConnectionDelegateImpl.mm b/src/platform/Darwin/BleConnectionDelegateImpl.mm
index 67ab838c4af525..d69623006d84ab 100644
--- a/src/platform/Darwin/BleConnectionDelegateImpl.mm
+++ b/src/platform/Darwin/BleConnectionDelegateImpl.mm
@@ -376,24 +376,19 @@ - (void)peripheral:(CBPeripheral *)peripheral
         chip::Ble::ChipBleUUID charId;
         [BleConnection fillServiceWithCharacteristicUuids:characteristic svcId:&svcId charId:&charId];
 
-        // build a inet buffer from the rxEv and send to blelayer.
-        __block chip::System::PacketBufferHandle msgBuf
-            = chip::System::PacketBufferHandle::NewWithData(characteristic.value.bytes, characteristic.value.length);
-
-        if (!msgBuf.IsNull()) {
-            dispatch_async(_chipWorkQueue, ^{
-                if (!_mBleLayer->HandleIndicationReceived((__bridge void *) peripheral, &svcId, &charId, std::move(msgBuf))) {
-                    // since this error comes from device manager core
-                    // we assume it would do the right thing, like closing the connection
-                    ChipLogError(Ble, "Failed at handling incoming BLE data");
-                }
-            });
-        } else {
-            ChipLogError(Ble, "Failed at allocating buffer for incoming BLE data");
-            dispatch_async(_chipWorkQueue, ^{
+        dispatch_async(_chipWorkQueue, ^{
+            // build a inet buffer from the rxEv and send to blelayer.
+            auto msgBuf = chip::System::PacketBufferHandle::NewWithData(characteristic.value.bytes, characteristic.value.length);
+
+            if (msgBuf.IsNull()) {
+                ChipLogError(Ble, "Failed at allocating buffer for incoming BLE data");
                 _mBleLayer->HandleConnectionError((__bridge void *) peripheral, CHIP_ERROR_NO_MEMORY);
-            });
-        }
+            } else if (!_mBleLayer->HandleIndicationReceived((__bridge void *) peripheral, &svcId, &charId, std::move(msgBuf))) {
+                // since this error comes from device manager core
+                // we assume it would do the right thing, like closing the connection
+                ChipLogError(Ble, "Failed at handling incoming BLE data");
+            }
+        });
     } else {
         ChipLogError(
             Ble, "BLE:Error receiving indication of Characteristics on the device: [%s]", [error.localizedDescription UTF8String]);
diff --git a/src/platform/ESP32/ConfigurationManagerImpl.cpp b/src/platform/ESP32/ConfigurationManagerImpl.cpp
index 20dc895b36d047..8cec8f46f9f92f 100644
--- a/src/platform/ESP32/ConfigurationManagerImpl.cpp
+++ b/src/platform/ESP32/ConfigurationManagerImpl.cpp
@@ -382,7 +382,8 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
     {
         ChipLogError(DeviceLayer, "esp_wifi_restore() failed: %s", esp_err_to_name(error));
     }
-#elif CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
     ThreadStackMgr().ErasePersistentInfo();
 #endif
 
diff --git a/src/platform/ESP32/ConnectivityManagerImpl.h b/src/platform/ESP32/ConnectivityManagerImpl.h
index 3065180a372d94..35658206b76c02 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl.h
+++ b/src/platform/ESP32/ConnectivityManagerImpl.h
@@ -161,7 +161,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     void UpdateInternetConnectivityState(void);
     void OnStationIPv4AddressAvailable(const ip_event_got_ip_t & got_ip);
     void OnStationIPv4AddressLost(void);
-    void OnIPv6AddressAvailable(const ip_event_got_ip6_t & got_ip);
+    void OnStationIPv6AddressAvailable(const ip_event_got_ip6_t & got_ip);
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
     // ===== Members for internal use by the following friends.
diff --git a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
index f426c5a56cbd69..4c962d24a5e5b0 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
+++ b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
@@ -520,7 +520,10 @@ void ConnectivityManagerImpl::OnWiFiPlatformEvent(const ChipDeviceEvent * event)
                 break;
             case IP_EVENT_GOT_IP6:
                 ChipLogProgress(DeviceLayer, "IP_EVENT_GOT_IP6");
-                OnIPv6AddressAvailable(event->Platform.ESPSystemEvent.Data.IpGotIp6);
+                if (strcmp(esp_netif_get_ifkey(event->Platform.ESPSystemEvent.Data.IpGotIp6.esp_netif), "WIFI_STA_DEF") == 0)
+                {
+                    OnStationIPv6AddressAvailable(event->Platform.ESPSystemEvent.Data.IpGotIp6);
+                }
                 break;
             default:
                 break;
@@ -1080,7 +1083,7 @@ void ConnectivityManagerImpl::OnStationIPv4AddressLost(void)
     PlatformMgr().PostEventOrDie(&event);
 }
 
-void ConnectivityManagerImpl::OnIPv6AddressAvailable(const ip_event_got_ip6_t & got_ip)
+void ConnectivityManagerImpl::OnStationIPv6AddressAvailable(const ip_event_got_ip6_t & got_ip)
 {
 #if CHIP_PROGRESS_LOGGING
     {
diff --git a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
index 4ac4bebca424ec..11c7c27ec5b76f 100644
--- a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
@@ -82,16 +82,17 @@ app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum MapAuthModeToSecurityTyp
     }
 }
 
-uint8_t GetWiFiVersionFromAPRecord(wifi_ap_record_t ap_info)
+app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum GetWiFiVersionFromAPRecord(wifi_ap_record_t ap_info)
 {
+    using app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum;
     if (ap_info.phy_11n)
-        return 3;
+        return WiFiVersionEnum::kN;
     else if (ap_info.phy_11g)
-        return 2;
+        return WiFiVersionEnum::kG;
     else if (ap_info.phy_11b)
-        return 1;
+        return WiFiVersionEnum::kB;
     else
-        return 0;
+        return WiFiVersionEnum::kUnknownEnumValue;
 }
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
@@ -234,7 +235,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
             {
                 memcpy(ifp->Ipv4AddressesBuffer[0], &(ipv4_info.ip.addr), kMaxIPv4AddrSize);
                 ifp->Ipv4AddressSpans[0] = ByteSpan(ifp->Ipv4AddressesBuffer[0], kMaxIPv4AddrSize);
-                ifp->IPv4Addresses       = chip::app::DataModel::List<chip::ByteSpan>(ifp->Ipv4AddressSpans, 1);
+                ifp->IPv4Addresses       = app::DataModel::List<ByteSpan>(ifp->Ipv4AddressSpans, 1);
             }
 
             static_assert(kMaxIPv6AddrCount <= UINT8_MAX, "Count might not fit in ipv6_addr_count");
@@ -253,7 +254,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
                 memcpy(ifp->Ipv6AddressesBuffer[idx], ip6_addr[idx].addr, kMaxIPv6AddrSize);
                 ifp->Ipv6AddressSpans[idx] = ByteSpan(ifp->Ipv6AddressesBuffer[idx], kMaxIPv6AddrSize);
             }
-            ifp->IPv6Addresses = chip::app::DataModel::List<chip::ByteSpan>(ifp->Ipv6AddressSpans, ipv6_addr_count);
+            ifp->IPv6Addresses = app::DataModel::List<ByteSpan>(ifp->Ipv6AddressSpans, ipv6_addr_count);
 
             ifp->Next = head;
             head      = ifp;
@@ -305,16 +306,15 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNe
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wifiVersion)
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion)
 {
-    wifiVersion = 0;
     wifi_ap_record_t ap_info;
-    esp_err_t err;
-    err = esp_wifi_sta_get_ap_info(&ap_info);
-    if (err == ESP_OK)
-    {
-        wifiVersion = GetWiFiVersionFromAPRecord(ap_info);
-    }
+    esp_err_t err = esp_wifi_sta_get_ap_info(&ap_info);
+    VerifyOrReturnError(err == ESP_OK, ESP32Utils::MapError(err));
+
+    wifiVersion = GetWiFiVersionFromAPRecord(ap_info);
+    VerifyOrReturnError(wifiVersion != app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kUnknownEnumValue,
+                        CHIP_ERROR_INTERNAL);
     return CHIP_NO_ERROR;
 }
 
@@ -328,8 +328,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiChannelNumber(uint16_t & channelNu
     if (err == ESP_OK)
     {
         channelNumber = ap_info.primary;
+        return CHIP_NO_ERROR;
     }
-    return CHIP_NO_ERROR;
+
+    return ESP32Utils::MapError(err);
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi)
@@ -343,8 +345,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi)
     if (err == ESP_OK)
     {
         rssi = ap_info.rssi;
+        return CHIP_NO_ERROR;
     }
-    return CHIP_NO_ERROR;
+
+    return ESP32Utils::MapError(err);
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconLostCount(uint32_t & beaconLostCount)
diff --git a/src/platform/ESP32/DiagnosticDataProviderImpl.h b/src/platform/ESP32/DiagnosticDataProviderImpl.h
index ff8f252a6844f1..d272386ad3ffe5 100644
--- a/src/platform/ESP32/DiagnosticDataProviderImpl.h
+++ b/src/platform/ESP32/DiagnosticDataProviderImpl.h
@@ -54,7 +54,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     CHIP_ERROR GetWiFiBssId(ByteSpan & BssId) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
-    CHIP_ERROR GetWiFiVersion(uint8_t & wifiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion) override;
     CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber) override;
     CHIP_ERROR GetWiFiRssi(int8_t & rssi) override;
     CHIP_ERROR GetWiFiBeaconLostCount(uint32_t & beaconLostCount) override;
diff --git a/src/platform/ESP32/ESP32Utils.cpp b/src/platform/ESP32/ESP32Utils.cpp
index e6dd3ea4df09c3..2b22f8ffa9fed7 100644
--- a/src/platform/ESP32/ESP32Utils.cpp
+++ b/src/platform/ESP32/ESP32Utils.cpp
@@ -38,9 +38,9 @@
 using namespace ::chip::DeviceLayer::Internal;
 using chip::DeviceLayer::Internal::DeviceNetworkInfo;
 
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
 CHIP_ERROR ESP32Utils::IsAPEnabled(bool & apEnabled)
 {
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
     wifi_mode_t curWiFiMode;
 
     esp_err_t err = esp_wifi_get_mode(&curWiFiMode);
@@ -53,8 +53,10 @@ CHIP_ERROR ESP32Utils::IsAPEnabled(bool & apEnabled)
     apEnabled = (curWiFiMode == WIFI_MODE_AP || curWiFiMode == WIFI_MODE_APSTA);
 
     return CHIP_NO_ERROR;
-}
+#else
+    return CHIP_ERROR_NOT_IMPLEMENTED;
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
+}
 
 CHIP_ERROR ESP32Utils::IsStationEnabled(bool & staEnabled)
 {
@@ -328,6 +330,58 @@ CHIP_ERROR ESP32Utils::ClearWiFiStationProvision(void)
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR ESP32Utils::InitWiFiStack(void)
+{
+    wifi_init_config_t cfg;
+    uint8_t ap_mac[6];
+    wifi_mode_t mode;
+    esp_err_t err = esp_netif_init();
+    if (err != ESP_OK)
+    {
+        return ESP32Utils::MapError(err);
+    }
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
+    if (!esp_netif_create_default_wifi_ap())
+    {
+        ChipLogError(DeviceLayer, "Failed to create the WiFi AP netif");
+        return CHIP_ERROR_INTERNAL;
+    }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
+    if (!esp_netif_create_default_wifi_sta())
+    {
+        ChipLogError(DeviceLayer, "Failed to create the WiFi STA netif");
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    // Initialize the ESP WiFi layer.
+    cfg = WIFI_INIT_CONFIG_DEFAULT();
+    err = esp_wifi_init(&cfg);
+    if (err != ESP_OK)
+    {
+        return ESP32Utils::MapError(err);
+    }
+
+    esp_wifi_get_mode(&mode);
+    if ((mode == WIFI_MODE_AP) || (mode == WIFI_MODE_APSTA))
+    {
+        esp_fill_random(ap_mac, sizeof(ap_mac));
+        /* Bit 0 of the first octet of MAC Address should always be 0 */
+        ap_mac[0] &= (uint8_t) ~0x01;
+        err = esp_wifi_set_mac(WIFI_IF_AP, ap_mac);
+        if (err != ESP_OK)
+        {
+            return ESP32Utils::MapError(err);
+        }
+    }
+    err = esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, PlatformManagerImpl::HandleESPSystemEvent, NULL);
+    if (err != ESP_OK)
+    {
+        return ESP32Utils::MapError(err);
+    }
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR ESP32Utils::MapError(esp_err_t error)
 {
     if (error == ESP_OK)
diff --git a/src/platform/ESP32/ESP32Utils.h b/src/platform/ESP32/ESP32Utils.h
index 716b85e8434d3a..c1d714ada787d4 100644
--- a/src/platform/ESP32/ESP32Utils.h
+++ b/src/platform/ESP32/ESP32Utils.h
@@ -29,9 +29,7 @@ namespace Internal {
 class ESP32Utils
 {
 public:
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
     static CHIP_ERROR IsAPEnabled(bool & apEnabled);
-#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
     static CHIP_ERROR IsStationEnabled(bool & staEnabled);
     static bool IsStationProvisioned(void);
     static CHIP_ERROR IsStationConnected(bool & connected);
@@ -48,6 +46,7 @@ class ESP32Utils
     static CHIP_ERROR GetWiFiStationProvision(Internal::DeviceNetworkInfo & netInfo, bool includeCredentials);
     static CHIP_ERROR SetWiFiStationProvision(const Internal::DeviceNetworkInfo & netInfo);
     static CHIP_ERROR ClearWiFiStationProvision(void);
+    static CHIP_ERROR InitWiFiStack(void);
 
     static CHIP_ERROR MapError(esp_err_t error);
     static void RegisterESP32ErrorFormatter();
diff --git a/src/platform/ESP32/OpenthreadLauncher.c b/src/platform/ESP32/OpenthreadLauncher.c
index c1ad467e032174..5c5bf6c9beea9b 100644
--- a/src/platform/ESP32/OpenthreadLauncher.c
+++ b/src/platform/ESP32/OpenthreadLauncher.c
@@ -31,6 +31,8 @@
 #include "openthread/logging.h"
 #include "openthread/tasklet.h"
 
+static esp_netif_t * openthread_netif = NULL;
+
 static esp_netif_t * init_openthread_netif(const esp_openthread_platform_config_t * config)
 {
     esp_netif_config_t cfg = ESP_NETIF_DEFAULT_OPENTHREAD();
@@ -43,20 +45,6 @@ static esp_netif_t * init_openthread_netif(const esp_openthread_platform_config_
 
 static void ot_task_worker(void * context)
 {
-    esp_openthread_platform_config_t config = {
-        .radio_config = ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG(),
-        .host_config  = ESP_OPENTHREAD_DEFAULT_HOST_CONFIG(),
-        .port_config  = ESP_OPENTHREAD_DEFAULT_PORT_CONFIG(),
-    };
-    esp_netif_t * openthread_netif;
-
-    // Initialize the OpenThread stack
-    ESP_ERROR_CHECK(esp_openthread_init(&config));
-    // The OpenThread log level directly matches ESP log level
-    (void) otLoggingSetLevel(CONFIG_LOG_DEFAULT_LEVEL);
-    // Initialize the esp_netif bindings
-    openthread_netif = init_openthread_netif(&config);
-
     // Run the main loop
     esp_openthread_launch_mainloop();
 
@@ -67,7 +55,7 @@ static void ot_task_worker(void * context)
     vTaskDelete(NULL);
 }
 
-esp_err_t openthread_launch_task(void)
+esp_err_t openthread_init_stack(void)
 {
     // Used eventfds:
     // * netif
@@ -79,6 +67,20 @@ esp_err_t openthread_launch_task(void)
 
     ESP_ERROR_CHECK(esp_netif_init());
     ESP_ERROR_CHECK(esp_vfs_eventfd_register(&eventfd_config));
+    esp_openthread_platform_config_t config = {
+        .radio_config = ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG(),
+        .host_config  = ESP_OPENTHREAD_DEFAULT_HOST_CONFIG(),
+        .port_config  = ESP_OPENTHREAD_DEFAULT_PORT_CONFIG(),
+    };
+    // Initialize the OpenThread stack
+    ESP_ERROR_CHECK(esp_openthread_init(&config));
+    // Initialize the esp_netif bindings
+    openthread_netif = init_openthread_netif(&config);
+    return ESP_OK;
+}
+
+esp_err_t openthread_launch_task(void)
+{
     xTaskCreate(ot_task_worker, "ot_task", CONFIG_THREAD_TASK_STACK_SIZE, xTaskGetCurrentTaskHandle(), 5, NULL);
     return ESP_OK;
 }
diff --git a/src/platform/ESP32/OpenthreadLauncher.h b/src/platform/ESP32/OpenthreadLauncher.h
index bd247d79207975..c562bfa34220ec 100644
--- a/src/platform/ESP32/OpenthreadLauncher.h
+++ b/src/platform/ESP32/OpenthreadLauncher.h
@@ -21,6 +21,7 @@
 extern "C" {
 #endif
 
+esp_err_t openthread_init_stack(void);
 esp_err_t openthread_launch_task(void);
 
 #ifdef __cplusplus
diff --git a/src/platform/ESP32/PlatformManagerImpl.cpp b/src/platform/ESP32/PlatformManagerImpl.cpp
index 074750654c2360..81bc561cddc667 100644
--- a/src/platform/ESP32/PlatformManagerImpl.cpp
+++ b/src/platform/ESP32/PlatformManagerImpl.cpp
@@ -63,63 +63,17 @@ static int app_entropy_source(void * data, unsigned char * output, size_t len, s
 
 CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
-    esp_err_t err;
     // Arrange for CHIP-encapsulated ESP32 errors to be translated to text
     Internal::ESP32Utils::RegisterESP32ErrorFormatter();
-
     // Make sure the LwIP core lock has been initialized
     ReturnErrorOnFailure(Internal::InitLwIPCoreLock());
-
-    err = esp_netif_init();
-    if (err != ESP_OK)
-    {
-        goto exit;
-    }
-
     // Arrange for the ESP event loop to deliver events into the CHIP Device layer.
-    err = esp_event_loop_create_default();
+    esp_err_t err = esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, PlatformManagerImpl::HandleESPSystemEvent, NULL);
     if (err != ESP_OK)
     {
-        goto exit;
+        return Internal::ESP32Utils::MapError(err);
     }
-
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-    {
-        wifi_init_config_t cfg;
-        uint8_t ap_mac[6];
-        wifi_mode_t mode;
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
-        esp_netif_create_default_wifi_ap();
-#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
-        esp_netif_create_default_wifi_sta();
-
-        esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, PlatformManagerImpl::HandleESPSystemEvent, NULL);
-        esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, PlatformManagerImpl::HandleESPSystemEvent, NULL);
-        mStartTime = System::SystemClock().GetMonotonicTimestamp();
-
-        // Initialize the ESP WiFi layer.
-        cfg = WIFI_INIT_CONFIG_DEFAULT();
-        err = esp_wifi_init(&cfg);
-        if (err != ESP_OK)
-        {
-            goto exit;
-        }
-
-        esp_wifi_get_mode(&mode);
-        if ((mode == WIFI_MODE_AP) || (mode == WIFI_MODE_APSTA))
-        {
-            esp_fill_random(ap_mac, sizeof(ap_mac));
-            /* Bit 0 of the first octet of MAC Address should always be 0 */
-            ap_mac[0] &= (uint8_t) ~0x01;
-            err = esp_wifi_set_mac(WIFI_IF_AP, ap_mac);
-            if (err != ESP_OK)
-            {
-                goto exit;
-            }
-        }
-    }
-#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
-
+    mStartTime = System::SystemClock().GetMonotonicTimestamp();
     ReturnErrorOnFailure(chip::Crypto::add_entropy_source(app_entropy_source, NULL, 16));
 
     // Call _InitChipStack() on the generic implementation base class
@@ -127,8 +81,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
     ReturnErrorOnFailure(Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack());
 
     ReturnErrorOnFailure(System::Clock::InitClock_RealTime());
-exit:
-    return chip::DeviceLayer::Internal::ESP32Utils::MapError(err);
+    return CHIP_NO_ERROR;
 }
 
 void PlatformManagerImpl::_Shutdown()
@@ -183,6 +136,7 @@ void PlatformManagerImpl::HandleESPSystemEvent(void * arg, esp_event_base_t even
             break;
         }
     }
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     else if (eventBase == WIFI_EVENT)
     {
         switch (eventId)
@@ -227,6 +181,7 @@ void PlatformManagerImpl::HandleESPSystemEvent(void * arg, esp_event_base_t even
             break;
         }
     }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
     sInstance.PostEventOrDie(&event);
 }
diff --git a/src/platform/ESP32/ThreadStackManagerImpl.cpp b/src/platform/ESP32/ThreadStackManagerImpl.cpp
index 10d7af019bfc13..5b4a311b48234a 100644
--- a/src/platform/ESP32/ThreadStackManagerImpl.cpp
+++ b/src/platform/ESP32/ThreadStackManagerImpl.cpp
@@ -52,13 +52,13 @@ ThreadStackManagerImpl ThreadStackManagerImpl::sInstance;
 
 CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
 {
-    openthread_launch_task();
+    openthread_init_stack();
     return GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(esp_openthread_get_instance());
 }
 
 CHIP_ERROR ThreadStackManagerImpl::_StartThreadTask()
 {
-    // Intentionally empty.
+    openthread_launch_task();
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
index 19bb5154ceed3c..076238a2f52899 100644
--- a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
@@ -245,9 +245,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNe
     return err;
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wiFiVersion)
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    using app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum;
+
     wl_bss_info_t bss_info;
     whd_security_t security;
     cy_rslt_t result = CY_RSLT_SUCCESS;
@@ -256,27 +257,26 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wiFiVersion)
     if (result != CY_RSLT_SUCCESS)
     {
         ChipLogError(DeviceLayer, "whd_wifi_get_ap_info failed: %d", (int) result);
-        SuccessOrExit(CHIP_ERROR_INTERNAL);
+        return CHIP_ERROR_INTERNAL;
     }
 
     /* VHT Capable */
     if (bss_info.vht_cap)
     {
-        wiFiVersion = to_underlying(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kAc);
+        wiFiVersion = WiFiVersionEnum::kAc;
     }
     /* HT Capable */
     else if (bss_info.n_cap)
     {
-        wiFiVersion = to_underlying(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kN);
+        wiFiVersion = WiFiVersionEnum::kN;
     }
     /* 11g Capable */
     else
     {
-        wiFiVersion = to_underlying(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kG);
+        wiFiVersion = WiFiVersionEnum::kG;
     }
 
-exit:
-    return err;
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiChannelNumber(uint16_t & channelNumber)
diff --git a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.h b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.h
index 80470d7996c22b..49756749c398da 100644
--- a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.h
+++ b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.h
@@ -77,7 +77,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 
     CHIP_ERROR GetWiFiBssId(ByteSpan & BssId) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
-    CHIP_ERROR GetWiFiVersion(uint8_t & wifiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion) override;
     CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber) override;
     CHIP_ERROR GetWiFiRssi(int8_t & rssi) override;
     CHIP_ERROR GetWiFiBeaconRxCount(uint32_t & beaconRxCount) override;
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index f3d3d2b138bd54..c04adfaf105780 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -1239,10 +1239,10 @@ CHIP_ERROR ConnectivityManagerImpl::GetWiFiSecurityType(SecurityTypeEnum & secur
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ConnectivityManagerImpl::GetWiFiVersion(uint8_t & wiFiVersion)
+CHIP_ERROR ConnectivityManagerImpl::GetWiFiVersion(WiFiVersionEnum & wiFiVersion)
 {
     // We don't have direct API to get the WiFi version yet, return 802.11n on Linux simulation.
-    wiFiVersion = to_underlying(WiFiVersionEnum::kN);
+    wiFiVersion = WiFiVersionEnum::kN;
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/platform/Linux/ConnectivityManagerImpl.h b/src/platform/Linux/ConnectivityManagerImpl.h
index 1ddb171d405a3c..e3fac9628a2238 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.h
+++ b/src/platform/Linux/ConnectivityManagerImpl.h
@@ -137,7 +137,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     int32_t GetDisconnectReason();
     CHIP_ERROR GetWiFiBssId(ByteSpan & value);
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType);
-    CHIP_ERROR GetWiFiVersion(uint8_t & wiFiVersion);
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion);
     CHIP_ERROR GetConfiguredNetwork(NetworkCommissioning::Network & network);
     CHIP_ERROR StartWiFiScan(ByteSpan ssid, NetworkCommissioning::WiFiDriver::ScanCallback * callback);
 #endif
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
index 2444b359cd83e3..08a42a599da0f2 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
@@ -813,7 +813,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::ResetWiFiNetworkDiagnosticsCounts()
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
-CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wiFiVersion)
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion)
 {
     return ConnectivityMgrImpl().GetWiFiVersion(wiFiVersion);
 }
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.h b/src/platform/Linux/DiagnosticDataProviderImpl.h
index 7dab9dafa68d84..f1320595624335 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.h
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.h
@@ -83,7 +83,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
-    CHIP_ERROR GetWiFiVersion(uint8_t & wiFiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion) override;
     CHIP_ERROR GetWiFiBssId(ByteSpan & value) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
 #endif
diff --git a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
index 9b40585f108c4c..7c1d8fe9c28ff6 100644
--- a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
@@ -257,9 +257,11 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNe
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wifiVersion)
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion)
 {
-    wifiVersion = 0;
+    // TODO: Keeping existing behavior, but this looks broken.
+    // https://github.com/project-chip/connectedhomeip/issues/25546
+    wifiVersion = app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kA;
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.h b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.h
index 357e3dbb9a3ef4..47aabacb85b9ff 100644
--- a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.h
+++ b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.h
@@ -52,7 +52,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     void ReleaseNetworkInterfaces(NetworkInterface * netifp) override;
     CHIP_ERROR GetWiFiBssId(ByteSpan & BssId) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
-    CHIP_ERROR GetWiFiVersion(uint8_t & wifiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion) override;
     CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber) override;
     CHIP_ERROR GetWiFiRssi(int8_t & rssi) override;
     CHIP_ERROR GetWiFiBeaconLostCount(uint32_t & beaconLostCount) override;
diff --git a/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.cpp b/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.cpp
index 8a058207581143..9190e451b680e4 100644
--- a/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.cpp
+++ b/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.cpp
@@ -61,7 +61,7 @@ DiagnosticDataProviderImplNrf::GetWiFiSecurityType(app::Clusters::WiFiNetworkDia
     return err;
 }
 
-CHIP_ERROR DiagnosticDataProviderImplNrf::GetWiFiVersion(uint8_t & wiFiVersion)
+CHIP_ERROR DiagnosticDataProviderImplNrf::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion)
 {
     WiFiManager::WiFiInfo info;
     CHIP_ERROR err = WiFiManager::Instance().GetWiFiInfo(info);
diff --git a/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.h b/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.h
index 1f6307726fc0ba..b3bc549c4aa0bb 100644
--- a/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.h
+++ b/src/platform/nrfconnect/DiagnosticDataProviderImplNrf.h
@@ -34,7 +34,7 @@ class DiagnosticDataProviderImplNrf : public DiagnosticDataProviderImpl
 #ifdef CONFIG_WIFI_NRF700X
     CHIP_ERROR GetWiFiBssId(ByteSpan & value) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
-    CHIP_ERROR GetWiFiVersion(uint8_t & wiFiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion) override;
     CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber) override;
     CHIP_ERROR GetWiFiRssi(int8_t & rssi) override;
     CHIP_ERROR GetWiFiBeaconLostCount(uint32_t & beaconLostCount) override;
diff --git a/src/platform/nrfconnect/wifi/WiFiManager.cpp b/src/platform/nrfconnect/wifi/WiFiManager.cpp
index 272dca72b20bb9..f8a8f63fdd166f 100644
--- a/src/platform/nrfconnect/wifi/WiFiManager.cpp
+++ b/src/platform/nrfconnect/wifi/WiFiManager.cpp
@@ -75,30 +75,30 @@ NetworkCommissioning::WiFiScanResponse ToScanResponse(const wifi_scan_result * r
 
 // Matter expectations towards Wi-Fi version codes are unaligned with
 // what wpa_supplicant provides. This function maps supplicant codes
-// to the ones defined in the Matter spec (11.14.3.2. WiFiVersion enum)
-uint8_t MapToMatterWiFiVersionCode(wifi_link_mode wifiVersion)
+// to the ones defined in the Matter spec (11.14.5.2. WiFiVersionEnum)
+app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum MapToMatterWiFiVersionCode(wifi_link_mode wifiVersion)
 {
     using app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum;
 
     if (wifiVersion < WIFI_1 || wifiVersion > WIFI_6E)
     {
         ChipLogError(DeviceLayer, "Unsupported Wi-Fi version detected");
-        return static_cast<uint8_t>(WiFiVersionEnum::kA); // let's return 'a' by default
+        return WiFiVersionEnum::kA; // let's return 'a' by default
     }
 
     switch (wifiVersion)
     {
     case WIFI_1:
-        return static_cast<uint8_t>(WiFiVersionEnum::kB);
+        return WiFiVersionEnum::kB;
     case WIFI_2:
-        return static_cast<uint8_t>(WiFiVersionEnum::kA);
+        return WiFiVersionEnum::kA;
     case WIFI_6E:
-        return static_cast<uint8_t>(WiFiVersionEnum::kAx); // treat as 802.11ax
+        return WiFiVersionEnum::kAx; // treat as 802.11ax
     default:
         break;
     }
 
-    return (static_cast<uint8_t>(wifiVersion) - 1);
+    return static_cast<WiFiVersionEnum>(wifiVersion - 1);
 }
 
 // Matter expectations towards Wi-Fi security type codes are unaligned with
diff --git a/src/platform/nrfconnect/wifi/WiFiManager.h b/src/platform/nrfconnect/wifi/WiFiManager.h
index beed57575f3283..2e1b86e94b0a8e 100644
--- a/src/platform/nrfconnect/wifi/WiFiManager.h
+++ b/src/platform/nrfconnect/wifi/WiFiManager.h
@@ -129,7 +129,7 @@ class WiFiManager
     {
         ByteSpan mBssId{};
         app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum mSecurityType{};
-        uint8_t mWiFiVersion{};
+        app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum mWiFiVersion{};
         uint16_t mChannel{};
         int8_t mRssi{};
         uint8_t mSsid[DeviceLayer::Internal::kMaxWiFiSSIDLength];
diff --git a/src/platform/nxp/mw320/ConnectivityManagerImpl.cpp b/src/platform/nxp/mw320/ConnectivityManagerImpl.cpp
index c5aa4adf1f9b69..bb8d3a39a7fa0c 100644
--- a/src/platform/nxp/mw320/ConnectivityManagerImpl.cpp
+++ b/src/platform/nxp/mw320/ConnectivityManagerImpl.cpp
@@ -209,10 +209,8 @@ CHIP_ERROR ConnectivityManagerImpl::GetWiFiBssId(ByteSpan & value)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ConnectivityManagerImpl::GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType)
+CHIP_ERROR ConnectivityManagerImpl::GetWiFiSecurityType(SecurityTypeEnum & securityType)
 {
-    using app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum;
-
     int ret = wlan_get_current_network(&sta_network);
     if (ret != WM_SUCCESS)
     {
@@ -244,10 +242,10 @@ CHIP_ERROR ConnectivityManagerImpl::GetWiFiSecurityType(app::Clusters::WiFiNetwo
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ConnectivityManagerImpl::GetWiFiVersion(uint8_t & wiFiVersion)
+CHIP_ERROR ConnectivityManagerImpl::GetWiFiVersion(WiFiVersionEnum & wiFiVersion)
 {
-    wiFiVersion = to_underlying(WiFiVersionEnum::kN);
-    ChipLogProgress(DeviceLayer, "GetWiFiVersion: %u", wiFiVersion);
+    wiFiVersion = WiFiVersionEnum::kN;
+    ChipLogProgress(DeviceLayer, "GetWiFiVersion: %u", to_underlying(wiFiVersion));
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/platform/nxp/mw320/ConnectivityManagerImpl.h b/src/platform/nxp/mw320/ConnectivityManagerImpl.h
index 83360590706920..23677c82afd8de 100644
--- a/src/platform/nxp/mw320/ConnectivityManagerImpl.h
+++ b/src/platform/nxp/mw320/ConnectivityManagerImpl.h
@@ -86,7 +86,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     void StartWiFiManagement();
     CHIP_ERROR GetWiFiBssId(ByteSpan & value);
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType);
-    CHIP_ERROR GetWiFiVersion(uint8_t & wiFiVersion);
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion);
 #endif
     CHIP_ERROR GetConfiguredNetwork(NetworkCommissioning::Network & network);
     CHIP_ERROR StartWiFiScan(ByteSpan ssid, NetworkCommissioning::WiFiDriver::ScanCallback * callback);
diff --git a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
index 4c6e7df903c8d6..07fff9135836a6 100644
--- a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
@@ -289,7 +289,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::ResetWiFiNetworkDiagnosticsCounts()
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wiFiVersion)
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion)
 {
     return ConnectivityMgrImpl().GetWiFiVersion(wiFiVersion);
 }
diff --git a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.h b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.h
index 1314aaa5a64883..72501a4d944de5 100644
--- a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.h
+++ b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.h
@@ -69,7 +69,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     CHIP_ERROR GetWiFiOverrunCount(uint64_t & overrunCount) override;
     CHIP_ERROR ResetWiFiNetworkDiagnosticsCounts() override;
 
-    CHIP_ERROR GetWiFiVersion(uint8_t & wiFiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion) override;
     CHIP_ERROR GetWiFiBssId(ByteSpan & value) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
 };
diff --git a/src/platform/silabs/DiagnosticDataProviderImpl.cpp b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
index 64451504c038f2..9662668c39c16d 100644
--- a/src/platform/silabs/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
@@ -376,9 +376,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNe
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wifiVersion)
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion)
 {
-    wifiVersion = to_underlying(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kN);
+    wifiVersion = app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kN;
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/platform/silabs/DiagnosticDataProviderImpl.h b/src/platform/silabs/DiagnosticDataProviderImpl.h
index bbaa8bff7dd26d..7d62cc8f84adc4 100644
--- a/src/platform/silabs/DiagnosticDataProviderImpl.h
+++ b/src/platform/silabs/DiagnosticDataProviderImpl.h
@@ -59,7 +59,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 #if SL_WIFI
     CHIP_ERROR GetWiFiBssId(ByteSpan & BssId) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
-    CHIP_ERROR GetWiFiVersion(uint8_t & wifiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion) override;
     CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber) override;
     CHIP_ERROR GetWiFiRssi(int8_t & rssi) override;
     CHIP_ERROR GetWiFiBeaconLostCount(uint32_t & beaconLostCount) override;
diff --git a/src/platform/silabs/efr32/KeyValueStoreManagerImpl.cpp b/src/platform/silabs/KeyValueStoreManagerImpl.cpp
similarity index 99%
rename from src/platform/silabs/efr32/KeyValueStoreManagerImpl.cpp
rename to src/platform/silabs/KeyValueStoreManagerImpl.cpp
index dc5b3267564e1b..ffff7b945186bb 100644
--- a/src/platform/silabs/efr32/KeyValueStoreManagerImpl.cpp
+++ b/src/platform/silabs/KeyValueStoreManagerImpl.cpp
@@ -49,7 +49,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::Init(void)
     err = SilabsConfig::Init();
     SuccessOrExit(err);
 
-    EFR32::EFR32Migration::GetMigrationManager().applyMigrations();
+    Silabs::MigrationManager::GetMigrationInstance().applyMigrations();
 
     memset(mKvsKeyMap, 0, sizeof(mKvsKeyMap));
     size_t outLen;
diff --git a/src/platform/silabs/efr32/MigrationManager.cpp b/src/platform/silabs/MigrationManager.cpp
similarity index 92%
rename from src/platform/silabs/efr32/MigrationManager.cpp
rename to src/platform/silabs/MigrationManager.cpp
index abd0bcbc834adf..037f9f7f292079 100644
--- a/src/platform/silabs/efr32/MigrationManager.cpp
+++ b/src/platform/silabs/MigrationManager.cpp
@@ -26,7 +26,7 @@ using namespace ::chip::DeviceLayer::PersistedStorage;
 
 namespace chip {
 namespace DeviceLayer {
-namespace EFR32 {
+namespace Silabs {
 
 namespace {
 typedef void (*func_ptr)();
@@ -45,7 +45,7 @@ static migrationData_t migrationTable[] = {
 
 } // namespace
 
-void EFR32Migration::applyMigrations()
+void MigrationManager::applyMigrations()
 {
     uint32_t lastMigationGroupDone = 0;
     SilabsConfig::ReadConfigValue(SilabsConfig::kConfigKey_MigrationCounter, lastMigationGroupDone);
@@ -62,12 +62,12 @@ void EFR32Migration::applyMigrations()
     SilabsConfig::WriteConfigValue(SilabsConfig::kConfigKey_MigrationCounter, completedMigrationGroup);
 }
 
-EFR32Migration & EFR32Migration::GetMigrationManager()
+MigrationManager & MigrationManager::GetMigrationInstance()
 {
-    static EFR32Migration sMigrationManager;
+    static MigrationManager sMigrationManager;
     return sMigrationManager;
 }
 
-} // namespace EFR32
+} // namespace Silabs
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/silabs/efr32/MigrationManager.h b/src/platform/silabs/MigrationManager.h
similarity index 80%
rename from src/platform/silabs/efr32/MigrationManager.h
rename to src/platform/silabs/MigrationManager.h
index 59ea29d0769152..2d560c4fa194df 100644
--- a/src/platform/silabs/efr32/MigrationManager.h
+++ b/src/platform/silabs/MigrationManager.h
@@ -20,25 +20,25 @@
 
 namespace chip {
 namespace DeviceLayer {
-namespace EFR32 {
+namespace Silabs {
 
-class EFR32Migration
+class MigrationManager
 {
     friend class KeyValueStoreManagerImpl;
 
 public:
     /**
-     * The EFR32 migration manager is implemented as a singleton
+     * The Silabs migration manager is implemented as a singleton
      * User should get the object from this getter.
      */
-    static EFR32Migration & GetMigrationManager();
+    static MigrationManager & GetMigrationInstance();
     static void applyMigrations();
 
 private:
-    EFR32Migration(){};
-    ~EFR32Migration(){};
+    MigrationManager(){};
+    ~MigrationManager(){};
 };
 
-} // namespace EFR32
+} // namespace Silabs
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp b/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp
index 65931fce7059bb..f3a745773d8092 100644
--- a/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp
+++ b/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp
@@ -194,22 +194,22 @@ void SlWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback
     }
 }
 
-chip::BitFlags<WiFiSecurity> SlWiFiDriver::ConvertSecuritytype(uint8_t security)
+chip::BitFlags<WiFiSecurity> SlWiFiDriver::ConvertSecuritytype(wfx_sec_t security)
 {
     chip::BitFlags<WiFiSecurity> securityType;
     if (security == WFX_SEC_NONE)
     {
         securityType = WiFiSecurity::kUnencrypted;
     }
-    else if (security & WFX_SEC_WEP)
+    else if (security == WFX_SEC_WEP)
     {
         securityType = WiFiSecurity::kWep;
     }
-    else if (security & WFX_SEC_WPA)
+    else if (security == WFX_SEC_WPA)
     {
         securityType = WiFiSecurity::kWpaPersonal;
     }
-    else if (security & WFX_SEC_WPA2)
+    else if (security == WFX_SEC_WPA2)
     {
         securityType = WiFiSecurity::kWpa2Personal;
     }
diff --git a/src/platform/silabs/NetworkCommissioningWiFiDriver.h b/src/platform/silabs/NetworkCommissioningWiFiDriver.h
index d311b11dda43a7..7e7dad3f3e9cdc 100644
--- a/src/platform/silabs/NetworkCommissioningWiFiDriver.h
+++ b/src/platform/silabs/NetworkCommissioningWiFiDriver.h
@@ -120,7 +120,7 @@ class SlWiFiDriver final : public WiFiDriver
 
     CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen);
 
-    chip::BitFlags<WiFiSecurity> ConvertSecuritytype(uint8_t security);
+    chip::BitFlags<WiFiSecurity> ConvertSecuritytype(wfx_sec_t security);
 
     void OnConnectWiFiNetwork();
     static SlWiFiDriver & GetInstance()
diff --git a/src/platform/silabs/SiWx917/BLEManagerImpl.cpp b/src/platform/silabs/SiWx917/BLEManagerImpl.cpp
index bd72b303a35377..6a4418ce5c0979 100644
--- a/src/platform/silabs/SiWx917/BLEManagerImpl.cpp
+++ b/src/platform/silabs/SiWx917/BLEManagerImpl.cpp
@@ -209,7 +209,7 @@ namespace {
 #define BLE_CONFIG_MIN_CE_LENGTH (0)      // Leave to min value
 #define BLE_CONFIG_MAX_CE_LENGTH (0xFFFF) // Leave to max value
 
-#define BLE__DEFAULT_TIMER_PERIOD 1
+#define BLE_DEFAULT_TIMER_PERIOD 1
 
 TimerHandle_t sbleAdvTimeoutTimer; // FreeRTOS sw timer.
 
@@ -247,11 +247,11 @@ CHIP_ERROR BLEManagerImpl::_Init()
     mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Enabled;
 
     // Create FreeRTOS sw timer for BLE timeouts and interval change.
-    sbleAdvTimeoutTimer = xTimerCreate("BleAdvTimer",             // Just a text name, not used by the RTOS kernel
-                                       BLE__DEFAULT_TIMER_PERIOD, // == default timer period (mS)
-                                       false,                     // no timer reload (==one-shot)
-                                       (void *) this,             // init timer id = ble obj context
-                                       BleAdvTimeoutHandler       // timer callback handler
+    sbleAdvTimeoutTimer = xTimerCreate("BleAdvTimer",                           // Just a text name, not used by the RTOS kernel
+                                       pdMS_TO_TICKS(BLE_DEFAULT_TIMER_PERIOD), // == default timer period
+                                       false,                                   // no timer reload (==one-shot)
+                                       (void *) this,                           // init timer id = ble obj context
+                                       BleAdvTimeoutHandler                     // timer callback handler
     );
 
     mFlags.ClearAll().Set(Flags::kAdvertisingEnabled, CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART);
@@ -985,7 +985,7 @@ void BLEManagerImpl::BleAdvTimeoutHandler(TimerHandle_t xTimer)
 
 void BLEManagerImpl::CancelBleAdvTimeoutTimer(void)
 {
-    if (xTimerStop(sbleAdvTimeoutTimer, 0) == pdFAIL)
+    if (xTimerStop(sbleAdvTimeoutTimer, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         ChipLogError(DeviceLayer, "Failed to stop BledAdv timeout timer");
     }
@@ -1001,7 +1001,7 @@ void BLEManagerImpl::StartBleAdvTimeoutTimer(uint32_t aTimeoutInMs)
     // timer is not active, change its period to required value (== restart).
     // FreeRTOS- Block for a maximum of 100 ticks if the change period command
     // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sbleAdvTimeoutTimer, aTimeoutInMs / portTICK_PERIOD_MS, 100) != pdPASS)
+    if (xTimerChangePeriod(sbleAdvTimeoutTimer, pdMS_TO_TICKS(aTimeoutInMs), pdMS_TO_TICKS(100)) != pdPASS)
     {
         ChipLogError(DeviceLayer, "Failed to start BledAdv timeout timer");
     }
diff --git a/src/platform/silabs/SiWx917/BUILD.gn b/src/platform/silabs/SiWx917/BUILD.gn
index d53d04894869ce..e79810a4029093 100644
--- a/src/platform/silabs/SiWx917/BUILD.gn
+++ b/src/platform/silabs/SiWx917/BUILD.gn
@@ -43,8 +43,11 @@ static_library("SiWx917") {
     "${silabs_platform_dir}/DiagnosticDataProviderImpl.cpp",
     "${silabs_platform_dir}/DiagnosticDataProviderImpl.h",
     "${silabs_platform_dir}/InetPlatformConfig.h",
+    "${silabs_platform_dir}/KeyValueStoreManagerImpl.cpp",
     "${silabs_platform_dir}/KeyValueStoreManagerImpl.h",
     "${silabs_platform_dir}/Logging.cpp",
+    "${silabs_platform_dir}/MigrationManager.cpp",
+    "${silabs_platform_dir}/MigrationManager.h",
     "${silabs_platform_dir}/PlatformManagerImpl.h",
     "${silabs_platform_dir}/SilabsConfig.cpp",
     "${silabs_platform_dir}/SilabsConfig.h",
@@ -53,7 +56,6 @@ static_library("SiWx917") {
     "../../SingletonConfigurationManager.cpp",
     "BLEManagerImpl.cpp",
     "ConfigurationManagerImpl.cpp",
-    "KeyValueStoreManagerImpl.cpp",
     "PlatformManagerImpl.cpp",
     "bluetooth/rsi_ble_config.h",
     "bluetooth/wfx_sl_ble_init.c",
diff --git a/src/platform/silabs/SiWx917/KeyValueStoreManagerImpl.cpp b/src/platform/silabs/SiWx917/KeyValueStoreManagerImpl.cpp
deleted file mode 100644
index 9bca8221fcb229..00000000000000
--- a/src/platform/silabs/SiWx917/KeyValueStoreManagerImpl.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *
- *    Copyright (c) 2021-2022 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Platform-specific key value storage implementation for SILABS
- */
-
-#include <lib/support/CHIPMemString.h>
-#include <lib/support/CodeUtils.h>
-#include <platform/CHIPDeviceLayer.h>
-#include <platform/KeyValueStoreManager.h>
-#include <platform/silabs/SilabsConfig.h>
-#include <stdio.h>
-#include <string.h>
-
-using namespace ::chip;
-using namespace ::chip::DeviceLayer::Internal;
-
-#define CONVERT_KEYMAP_INDEX_TO_NVM3KEY(index) (SilabsConfig::kConfigKey_KvsFirstKeySlot + index)
-#define CONVERT_NVM3KEY_TO_KEYMAP_INDEX(nvm3Key) (nvm3Key - SilabsConfig::kConfigKey_KvsFirstKeySlot)
-
-namespace chip {
-namespace DeviceLayer {
-namespace PersistedStorage {
-
-KeyValueStoreManagerImpl KeyValueStoreManagerImpl::sInstance;
-char mKvsStoredKeyString[KeyValueStoreManagerImpl::kMaxEntries][PersistentStorageDelegate::kKeyLengthMax + 1];
-
-CHIP_ERROR KeyValueStoreManagerImpl::Init(void)
-{
-    CHIP_ERROR err;
-    err = SilabsConfig::Init();
-    SuccessOrExit(err);
-
-    memset(mKvsStoredKeyString, 0, sizeof(mKvsStoredKeyString));
-    size_t outLen;
-    err = SilabsConfig::ReadConfigValueBin(SilabsConfig::kConfigKey_KvsStringKeyMap,
-                                           reinterpret_cast<uint8_t *>(mKvsStoredKeyString), sizeof(mKvsStoredKeyString), outLen);
-
-    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND) // Initial boot
-    {
-        err = CHIP_NO_ERROR;
-    }
-
-exit:
-    return err;
-}
-
-bool KeyValueStoreManagerImpl::IsValidKvsNvm3Key(uint32_t nvm3Key) const
-{
-    return ((SilabsConfig::kConfigKey_KvsFirstKeySlot <= nvm3Key) && (nvm3Key <= SilabsConfig::kConfigKey_KvsLastKeySlot));
-}
-
-CHIP_ERROR KeyValueStoreManagerImpl::MapKvsKeyToNvm3(const char * key, uint32_t & nvm3Key, bool isSlotNeeded) const
-{
-    CHIP_ERROR err;
-    uint8_t firstEmptyKeySlot = kMaxEntries;
-    for (uint8_t keyIndex = 0; keyIndex < kMaxEntries; keyIndex++)
-    {
-        if (strcmp(key, mKvsStoredKeyString[keyIndex]) == 0)
-        {
-            nvm3Key = CONVERT_KEYMAP_INDEX_TO_NVM3KEY(keyIndex);
-            VerifyOrDie(IsValidKvsNvm3Key(nvm3Key) == true);
-            return CHIP_NO_ERROR;
-        }
-
-        if (isSlotNeeded && (firstEmptyKeySlot == kMaxEntries) && (mKvsStoredKeyString[keyIndex][0] == 0))
-        {
-            firstEmptyKeySlot = keyIndex;
-        }
-    }
-
-    if (isSlotNeeded)
-    {
-        if (firstEmptyKeySlot != kMaxEntries)
-        {
-            nvm3Key = CONVERT_KEYMAP_INDEX_TO_NVM3KEY(firstEmptyKeySlot);
-            VerifyOrDie(IsValidKvsNvm3Key(nvm3Key) == true);
-            err = CHIP_NO_ERROR;
-        }
-        else
-        {
-            err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
-        }
-    }
-    else
-    {
-        err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
-    }
-    return err;
-}
-
-void KeyValueStoreManagerImpl::ForceKeyMapSave()
-{
-    OnScheduledKeyMapSave(nullptr, nullptr);
-}
-
-void KeyValueStoreManagerImpl::OnScheduledKeyMapSave(System::Layer * systemLayer, void * appState)
-{
-    SilabsConfig::WriteConfigValueBin(SilabsConfig::kConfigKey_KvsStringKeyMap,
-                                      reinterpret_cast<const uint8_t *>(mKvsStoredKeyString), sizeof(mKvsStoredKeyString));
-}
-
-void KeyValueStoreManagerImpl::ScheduleKeyMapSave(void)
-{
-    /*
-        During commissioning, the key map will be modified multiples times subsequently.
-        Commit the key map in nvm once it as stabilized.
-    */
-    SystemLayer().StartTimer(
-        std::chrono::duration_cast<System::Clock::Timeout>(System::Clock::Seconds32(SILABS_KVS_SAVE_DELAY_SECONDS)),
-        KeyValueStoreManagerImpl::OnScheduledKeyMapSave, NULL);
-}
-
-CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t value_size, size_t * read_bytes_size,
-                                          size_t offset_bytes) const
-{
-    VerifyOrReturnError(key != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    uint32_t nvm3Key;
-    CHIP_ERROR err = MapKvsKeyToNvm3(key, nvm3Key);
-    VerifyOrReturnError(err == CHIP_NO_ERROR, err);
-
-    size_t outLen;
-    err = SilabsConfig::ReadConfigValueBin(nvm3Key, reinterpret_cast<uint8_t *>(value), value_size, outLen, offset_bytes);
-    if (read_bytes_size)
-    {
-        *read_bytes_size = outLen;
-    }
-
-    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
-    {
-        return CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
-    }
-
-    return err;
-}
-
-CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value, size_t value_size)
-{
-    VerifyOrReturnError(key != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    uint32_t nvm3Key;
-    CHIP_ERROR err = MapKvsKeyToNvm3(key, nvm3Key, /* isSlotNeeded */ true);
-    VerifyOrReturnError(err == CHIP_NO_ERROR, err);
-
-    err = SilabsConfig::WriteConfigValueBin(nvm3Key, reinterpret_cast<const uint8_t *>(value), value_size);
-    if (err == CHIP_NO_ERROR)
-    {
-        uint32_t keyIndex = nvm3Key - SilabsConfig::kConfigKey_KvsFirstKeySlot;
-        Platform::CopyString(mKvsStoredKeyString[keyIndex], key);
-        ScheduleKeyMapSave();
-    }
-
-    return err;
-}
-
-CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
-{
-    VerifyOrReturnError(key != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    uint32_t nvm3Key;
-    CHIP_ERROR err = MapKvsKeyToNvm3(key, nvm3Key);
-    VerifyOrReturnError(err == CHIP_NO_ERROR, err);
-
-    err = SilabsConfig::ClearConfigValue(nvm3Key);
-    if (err == CHIP_NO_ERROR)
-    {
-        uint32_t keyIndex = CONVERT_NVM3KEY_TO_KEYMAP_INDEX(nvm3Key);
-        memset(mKvsStoredKeyString[keyIndex], 0, sizeof(mKvsStoredKeyString[keyIndex]));
-        ScheduleKeyMapSave();
-    }
-
-    return err;
-}
-
-CHIP_ERROR KeyValueStoreManagerImpl::ErasePartition(void)
-{
-    // Iterate over all the Matter Kvs nvm3 records and delete each one...
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    for (uint32_t nvm3Key = SilabsConfig::kMinConfigKey_MatterKvs; nvm3Key < SilabsConfig::kMaxConfigKey_MatterKvs; nvm3Key++)
-    {
-        err = SilabsConfig::ClearConfigValue(nvm3Key);
-
-        if (err != CHIP_NO_ERROR)
-        {
-            break;
-        }
-    }
-
-    memset(mKvsStoredKeyString, 0, sizeof(mKvsStoredKeyString));
-    return err;
-}
-
-} // namespace PersistedStorage
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/silabs/SiWx917/wifi/wfx_host_events.h b/src/platform/silabs/SiWx917/wifi/wfx_host_events.h
index e1e31dcbbe8fae..44539c20039003 100644
--- a/src/platform/silabs/SiWx917/wifi/wfx_host_events.h
+++ b/src/platform/silabs/SiWx917/wifi/wfx_host_events.h
@@ -113,7 +113,7 @@
  * be held in the Blocked state to wait for the start command to be successfully
  * sent to the timer command queue.
  */
-#define TIMER_TICKS_TO_WAIT_0 0
+#define TIMER_TICKS_TO_WAIT_0 pdMS_TO_TICKS(0)
 
 #define CONVERT_SEC_TO_MSEC 1000
 #define CONVERT_USEC_TO_MSEC (1 / 1000)
diff --git a/src/platform/silabs/efr32/BLEManagerImpl.cpp b/src/platform/silabs/efr32/BLEManagerImpl.cpp
index a76f26c6df6b20..ae8bb91ad846c4 100644
--- a/src/platform/silabs/efr32/BLEManagerImpl.cpp
+++ b/src/platform/silabs/efr32/BLEManagerImpl.cpp
@@ -124,7 +124,7 @@ CHIP_ERROR BLEManagerImpl::_Init()
 
     // Create FreeRTOS sw timer for BLE timeouts and interval change.
     sbleAdvTimeoutTimer = xTimerCreate("BleAdvTimer",       // Just a text name, not used by the RTOS kernel
-                                       1,                   // == default timer period (mS)
+                                       pdMS_TO_TICKS(1),    // == default timer period
                                        false,               // no timer reload (==one-shot)
                                        (void *) this,       // init timer id = ble obj context
                                        BleAdvTimeoutHandler // timer callback handler
@@ -958,7 +958,7 @@ void BLEManagerImpl::BleAdvTimeoutHandler(TimerHandle_t xTimer)
 
 void BLEManagerImpl::CancelBleAdvTimeoutTimer(void)
 {
-    if (xTimerStop(sbleAdvTimeoutTimer, 0) == pdFAIL)
+    if (xTimerStop(sbleAdvTimeoutTimer, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         ChipLogError(DeviceLayer, "Failed to stop BledAdv timeout timer");
     }
@@ -974,7 +974,7 @@ void BLEManagerImpl::StartBleAdvTimeoutTimer(uint32_t aTimeoutInMs)
     // timer is not active, change its period to required value (== restart).
     // FreeRTOS- Block for a maximum of 100 ticks if the change period command
     // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sbleAdvTimeoutTimer, aTimeoutInMs / portTICK_PERIOD_MS, 100) != pdPASS)
+    if (xTimerChangePeriod(sbleAdvTimeoutTimer, pdMS_TO_TICKS(aTimeoutInMs), pdMS_TO_TICKS(100)) != pdPASS)
     {
         ChipLogError(DeviceLayer, "Failed to start BledAdv timeout timer");
     }
diff --git a/src/platform/silabs/efr32/BUILD.gn b/src/platform/silabs/efr32/BUILD.gn
index f294a8d2d10846..f5f0108ed778e2 100644
--- a/src/platform/silabs/efr32/BUILD.gn
+++ b/src/platform/silabs/efr32/BUILD.gn
@@ -57,8 +57,10 @@ static_library("efr32") {
     "${silabs_platform_dir}/DiagnosticDataProviderImpl.cpp",
     "${silabs_platform_dir}/DiagnosticDataProviderImpl.h",
     "${silabs_platform_dir}/InetPlatformConfig.h",
+    "${silabs_platform_dir}/KeyValueStoreManagerImpl.cpp",
     "${silabs_platform_dir}/KeyValueStoreManagerImpl.h",
     "${silabs_platform_dir}/Logging.cpp",
+    "${silabs_platform_dir}/MigrationManager.cpp",
     "${silabs_platform_dir}/PlatformManagerImpl.h",
     "${silabs_platform_dir}/SilabsConfig.cpp",
     "${silabs_platform_dir}/SilabsConfig.h",
@@ -66,8 +68,6 @@ static_library("efr32") {
     "../../FreeRTOS/SystemTimeSupport.cpp",
     "../../SingletonConfigurationManager.cpp",
     "ConfigurationManagerImpl.cpp",
-    "KeyValueStoreManagerImpl.cpp",
-    "MigrationManager.cpp",
     "PlatformManagerImpl.cpp",
   ]
 
diff --git a/src/platform/silabs/efr32/rs911x/BLEManagerImpl.cpp b/src/platform/silabs/efr32/rs911x/BLEManagerImpl.cpp
index 1743507998d80b..4ba427c84c8811 100644
--- a/src/platform/silabs/efr32/rs911x/BLEManagerImpl.cpp
+++ b/src/platform/silabs/efr32/rs911x/BLEManagerImpl.cpp
@@ -212,7 +212,7 @@ namespace {
 #define BLE_CONFIG_MIN_CE_LENGTH (0)      // Leave to min value
 #define BLE_CONFIG_MAX_CE_LENGTH (0xFFFF) // Leave to max value
 
-#define BLE__DEFAULT_TIMER_PERIOD 1
+#define BLE_DEFAULT_TIMER_PERIOD 1
 
 TimerHandle_t sbleAdvTimeoutTimer; // FreeRTOS sw timer.
 
@@ -252,11 +252,11 @@ CHIP_ERROR BLEManagerImpl::_Init()
     mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Enabled;
 
     // Create FreeRTOS sw timer for BLE timeouts and interval change.
-    sbleAdvTimeoutTimer = xTimerCreate("BleAdvTimer",             // Just a text name, not used by the RTOS kernel
-                                       BLE__DEFAULT_TIMER_PERIOD, // == default timer period (mS)
-                                       false,                     // no timer reload (==one-shot)
-                                       (void *) this,             // init timer id = ble obj context
-                                       BleAdvTimeoutHandler       // timer callback handler
+    sbleAdvTimeoutTimer = xTimerCreate("BleAdvTimer",                           // Just a text name, not used by the RTOS kernel
+                                       pdMS_TO_TICKS(BLE_DEFAULT_TIMER_PERIOD), // == default timer period
+                                       false,                                   // no timer reload (==one-shot)
+                                       (void *) this,                           // init timer id = ble obj context
+                                       BleAdvTimeoutHandler                     // timer callback handler
     );
 
     mFlags.ClearAll().Set(Flags::kAdvertisingEnabled, CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART);
@@ -980,7 +980,7 @@ void BLEManagerImpl::BleAdvTimeoutHandler(TimerHandle_t xTimer)
 
 void BLEManagerImpl::CancelBleAdvTimeoutTimer(void)
 {
-    if (xTimerStop(sbleAdvTimeoutTimer, 0) == pdFAIL)
+    if (xTimerStop(sbleAdvTimeoutTimer, pdMS_TO_TICKS(0)) == pdFAIL)
     {
         ChipLogError(DeviceLayer, "Failed to stop BledAdv timeout timer");
     }
@@ -996,7 +996,7 @@ void BLEManagerImpl::StartBleAdvTimeoutTimer(uint32_t aTimeoutInMs)
     // timer is not active, change its period to required value (== restart).
     // FreeRTOS- Block for a maximum of 100 ticks if the change period command
     // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sbleAdvTimeoutTimer, aTimeoutInMs / portTICK_PERIOD_MS, 100) != pdPASS)
+    if (xTimerChangePeriod(sbleAdvTimeoutTimer, pdMS_TO_TICKS(aTimeoutInMs), pdMS_TO_TICKS(100)) != pdPASS)
     {
         ChipLogError(DeviceLayer, "Failed to start BledAdv timeout timer");
     }
diff --git a/src/platform/silabs/efr32/wifi/wfx_host_events.h b/src/platform/silabs/efr32/wifi/wfx_host_events.h
index 978ed2fee2ab70..30d6fdc0155f16 100644
--- a/src/platform/silabs/efr32/wifi/wfx_host_events.h
+++ b/src/platform/silabs/efr32/wifi/wfx_host_events.h
@@ -202,7 +202,7 @@ typedef struct __attribute__((__packed__)) sl_wfx_mib_req_s
  * be held in the Blocked state to wait for the start command to be successfully
  * sent to the timer command queue.
  */
-#define TIMER_TICKS_TO_WAIT_0 0
+#define TIMER_TICKS_TO_WAIT_0 pdMS_TO_TICKS(0)
 
 #define CONVERT_SEC_TO_MSEC 1000
 #define CONVERT_USEC_TO_MSEC (1 / 1000)
diff --git a/src/platform/webos/ConnectivityManagerImpl.cpp b/src/platform/webos/ConnectivityManagerImpl.cpp
index 32870b75c180aa..6cbefb8751eeae 100644
--- a/src/platform/webos/ConnectivityManagerImpl.cpp
+++ b/src/platform/webos/ConnectivityManagerImpl.cpp
@@ -1150,7 +1150,7 @@ CHIP_ERROR ConnectivityManagerImpl::GetWiFiBssId(ByteSpan & value)
     return err;
 }
 
-CHIP_ERROR ConnectivityManagerImpl::GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType)
+CHIP_ERROR ConnectivityManagerImpl::GetWiFiSecurityType(SecurityTypeEnum & securityType)
 {
     const gchar * mode = nullptr;
 
@@ -1201,10 +1201,11 @@ CHIP_ERROR ConnectivityManagerImpl::GetWiFiSecurityType(app::Clusters::WiFiNetwo
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ConnectivityManagerImpl::GetWiFiVersion(uint8_t & wiFiVersion)
+CHIP_ERROR ConnectivityManagerImpl::GetWiFiVersion(WiFiVersionEnum & wiFiVersion)
 {
     // We don't have direct API to get the WiFi version yet, return 802.11n on Linux simulation.
-    wiFiVersion = to_underlying(WiFiVersionEnum::kN);
+    // TODO: This is not "Linux simulation".
+    wiFiVersion = WiFiVersionEnum::kN;
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/platform/webos/ConnectivityManagerImpl.h b/src/platform/webos/ConnectivityManagerImpl.h
index 2d3b08c647282e..6d23f83d8683f0 100644
--- a/src/platform/webos/ConnectivityManagerImpl.h
+++ b/src/platform/webos/ConnectivityManagerImpl.h
@@ -137,7 +137,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     int32_t GetDisconnectReason();
     CHIP_ERROR GetWiFiBssId(ByteSpan & value);
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType);
-    CHIP_ERROR GetWiFiVersion(uint8_t & wiFiVersion);
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion);
     CHIP_ERROR GetConfiguredNetwork(NetworkCommissioning::Network & network);
     CHIP_ERROR StartWiFiScan(ByteSpan ssid, NetworkCommissioning::WiFiDriver::ScanCallback * callback);
 #endif
diff --git a/src/platform/webos/DiagnosticDataProviderImpl.cpp b/src/platform/webos/DiagnosticDataProviderImpl.cpp
index 22790a4705849c..dc4e534f40e18c 100644
--- a/src/platform/webos/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/webos/DiagnosticDataProviderImpl.cpp
@@ -782,7 +782,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::ResetWiFiNetworkDiagnosticsCounts()
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
-CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wiFiVersion)
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion)
 {
     return ConnectivityMgrImpl().GetWiFiVersion(wiFiVersion);
 }
diff --git a/src/platform/webos/DiagnosticDataProviderImpl.h b/src/platform/webos/DiagnosticDataProviderImpl.h
index ba933b8743dfbf..87a7eb6f9c1982 100644
--- a/src/platform/webos/DiagnosticDataProviderImpl.h
+++ b/src/platform/webos/DiagnosticDataProviderImpl.h
@@ -81,7 +81,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
-    CHIP_ERROR GetWiFiVersion(uint8_t & wiFiVersion) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wiFiVersion) override;
     CHIP_ERROR GetWiFiBssId(ByteSpan & value) override;
     CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
 #endif
diff --git a/src/protocols/user_directed_commissioning/UserDirectedCommissioningClient.cpp b/src/protocols/user_directed_commissioning/UserDirectedCommissioningClient.cpp
index ac3c017da0577e..6a912e66a37b98 100644
--- a/src/protocols/user_directed_commissioning/UserDirectedCommissioningClient.cpp
+++ b/src/protocols/user_directed_commissioning/UserDirectedCommissioningClient.cpp
@@ -34,17 +34,17 @@ namespace UserDirectedCommissioning {
 CHIP_ERROR UserDirectedCommissioningClient::SendUDCMessage(TransportMgrBase * transportMgr, System::PacketBufferHandle && payload,
                                                            chip::Transport::PeerAddress peerAddress)
 {
-    CHIP_ERROR err = EncodeUDCMessage(payload);
-    if (err != CHIP_NO_ERROR)
-    {
-        return err;
-    }
+    ReturnErrorOnFailure(EncodeUDCMessage(payload));
+
     ChipLogProgress(Inet, "Sending UDC msg");
 
     // send UDC message 5 times per spec (no ACK on this message)
     for (unsigned int i = 0; i < 5; i++)
     {
-        err = transportMgr->SendMessage(peerAddress, payload.CloneData());
+        auto msgCopy = payload.CloneData();
+        VerifyOrReturnError(!msgCopy.IsNull(), CHIP_ERROR_NO_MEMORY);
+
+        auto err = transportMgr->SendMessage(peerAddress, std::move(msgCopy));
         if (err != CHIP_NO_ERROR)
         {
             ChipLogError(AppServer, "UDC SendMessage failed: %" CHIP_ERROR_FORMAT, err.Format());
@@ -52,8 +52,9 @@ CHIP_ERROR UserDirectedCommissioningClient::SendUDCMessage(TransportMgrBase * tr
         }
         sleep(1);
     }
-    ChipLogProgress(Inet, "UDC msg send status %" CHIP_ERROR_FORMAT, err.Format());
-    return err;
+
+    ChipLogProgress(Inet, "UDC msg sent");
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR UserDirectedCommissioningClient::EncodeUDCMessage(const System::PacketBufferHandle & payload)
diff --git a/src/setup_payload/tests/BUILD.gn b/src/setup_payload/tests/BUILD.gn
index 2d76bb4cfa5680..1b39f08f0eca25 100644
--- a/src/setup_payload/tests/BUILD.gn
+++ b/src/setup_payload/tests/BUILD.gn
@@ -34,6 +34,7 @@ chip_test_suite("tests") {
 
   public_deps = [
     "${chip_root}/src/lib/support:testing",
+    "${chip_root}/src/platform",
     "${chip_root}/src/setup_payload",
     "${nlunit_test_root}:nlunit-test",
   ]
diff --git a/src/system/SystemStats.cpp b/src/system/SystemStats.cpp
index bf3473fd62c924..244a2517b31c78 100644
--- a/src/system/SystemStats.cpp
+++ b/src/system/SystemStats.cpp
@@ -29,6 +29,7 @@
 #include <system/SystemStats.h>
 
 #include <lib/support/SafeInt.h>
+#include <platform/LockTracker.h>
 
 #include <string.h>
 
@@ -59,21 +60,29 @@ count_t sHighWatermarks[kNumEntries];
 
 const Label * GetStrings()
 {
+    assertChipStackLockedByCurrentThread();
+
     return sStatsStrings;
 }
 
 count_t * GetResourcesInUse()
 {
+    assertChipStackLockedByCurrentThread();
+
     return sResourcesInUse;
 }
 
 count_t * GetHighWatermarks()
 {
+    assertChipStackLockedByCurrentThread();
+
     return sHighWatermarks;
 }
 
 void UpdateSnapshot(Snapshot & aSnapshot)
 {
+    assertChipStackLockedByCurrentThread();
+
     memcpy(&aSnapshot.mResourcesInUse, &sResourcesInUse, sizeof(aSnapshot.mResourcesInUse));
     memcpy(&aSnapshot.mHighWatermarks, &sHighWatermarks, sizeof(aSnapshot.mHighWatermarks));
 
diff --git a/src/tools/chip-cert/dacs.py b/src/tools/chip-cert/dacs.py
index 5556d266e07a11..76705162fd741c 100755
--- a/src/tools/chip-cert/dacs.py
+++ b/src/tools/chip-cert/dacs.py
@@ -24,6 +24,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
+/**
+ * NOTE: This file is generated by src/tools/chip-cert/dacs.py.
+ */
 """
 
 
@@ -82,16 +86,20 @@ class CertType(Enum):
 
 
 class Names:
-    def __init__(self, cert_type: CertType, test_dir, dev_dir, pid):
-        prefixes = {CertType.PAA: test_dir + '/Chip-Test-PAA-FFF1-',
-                    CertType.PAI: dev_dir + '/Matter-Development-PAI-noPID-',
-                    CertType.DAC: dev_dir + '/Matter-Development-DAC-{:X}-'.format(pid)}
+    def __init__(self, cert_type: CertType, test_dir, dev_dir, vid, pid):
+        if vid == 0xFFF1:
+            paa_file_prefix = 'Chip-Test-PAA-FFF1-'
+        else:
+            paa_file_prefix = 'Chip-Test-PAA-NoVID-'
+        prefixes = {CertType.PAA: test_dir + paa_file_prefix,
+                    CertType.PAI: dev_dir + '/Matter-Development-PAI-{:X}-noPID-'.format(vid),
+                    CertType.DAC: dev_dir + '/Matter-Development-DAC-{:X}-{:X}-'.format(vid, pid)}
         array_names_prefix = {CertType.PAA: 'kTestPAA_',
                               CertType.PAI: 'kDevelopmentPAI_',
                               CertType.DAC: 'kDevelopmentDAC_'}
         array_names_suffix = {CertType.PAA: '',
-                              CertType.PAI: '_FFF1',
-                              CertType.DAC: '_FFF1_{:X}'.format(pid)}
+                              CertType.PAI: '_{:X}'.format(vid),
+                              CertType.DAC: '_{:X}_{:X}'.format(vid, pid)}
         generic_prefix = {CertType.PAA: 'kPaa',
                           CertType.PAI: 'kPai',
                           CertType.DAC: 'kDac'}
@@ -111,7 +119,8 @@ def __init__(self, cert_type: CertType, test_dir, dev_dir, pid):
 
 
 class DevCertBuilder:
-    def __init__(self, cert_type: CertType, dev_dir: str, test_dir: str, chip_cert_dir: str, pid: int):
+    def __init__(self, cert_type: CertType, dev_dir: str, test_dir: str, chip_cert_dir: str, vid: int, pid: int):
+        self.vid = vid
         self.pid = pid
         self.cert_type = cert_type
         self.chipcert = chip_cert_dir + 'chip-cert'
@@ -119,9 +128,9 @@ def __init__(self, cert_type: CertType, dev_dir: str, test_dir: str, chip_cert_d
         if not os.path.exists(self.chipcert):
             raise Exception('Path not found: %s' % self.chipcert)
 
-        paa = Names(CertType.PAA, test_dir, dev_dir, pid)
-        pai = Names(CertType.PAI, test_dir, dev_dir, pid)
-        dac = Names(CertType.DAC, test_dir, dev_dir, pid)
+        paa = Names(CertType.PAA, test_dir, dev_dir, vid, pid)
+        pai = Names(CertType.PAI, test_dir, dev_dir, vid, pid)
+        dac = Names(CertType.DAC, test_dir, dev_dir, vid, pid)
         if cert_type == CertType.PAI:
             self.signer = paa
             self.own = pai
@@ -132,12 +141,12 @@ def __init__(self, cert_type: CertType, dev_dir: str, test_dir: str, chip_cert_d
     def make_certs_and_keys(self) -> None:
         """Creates the PEM and DER certs and keyfiles"""
         if self.cert_type == CertType.PAI:
-            subject_name = 'Matter Dev PAI 0xFFF1 no PID'
+            subject_name = 'Matter Dev PAI 0x{:X} no PID'.format(self.vid)
             pid_flag = ''
             type_flag = '-t i'
             vidpid_fallback_encoding_flag = ''
         elif self.cert_type == CertType.DAC:
-            subject_name = 'Matter Dev DAC 0xFFF1/0x{:X}'.format(self.pid)
+            subject_name = 'Matter Dev DAC 0x{:X}/0x{:X}'.format(self.vid, self.pid)
             pid_flag = '-P 0x{:X}'.format(self.pid)
             type_flag = '-t d'
             # For a subset of DACs with PIDs in a range [0x8010, 0x8014]
@@ -150,7 +159,7 @@ def make_certs_and_keys(self) -> None:
             return
 
         cmd = self.chipcert + ' gen-att-cert ' + type_flag + ' -c "' + subject_name + '" -C ' + self.signer.cert_pem + ' -K ' + \
-            self.signer.key_pem + ' -V 0xFFF1 ' + pid_flag + vidpid_fallback_encoding_flag + \
+            self.signer.key_pem + ' -V 0x{:X} '.format(self.vid) + pid_flag + vidpid_fallback_encoding_flag + \
             ' -l 4294967295 -o ' + self.own.cert_pem + ' -O ' + self.own.key_pem
         subprocess.run(cmd, shell=True)
         cmd = 'openssl x509 -inform pem -in ' + self.own.cert_pem + \
@@ -234,59 +243,76 @@ def main():
 
     args = argparser.parse_args()
     builder = DevCertBuilder(CertType.PAI, args.certdir,
-                             args.testdir, args.chipcertdir, 0x8000)
+                             args.testdir, args.chipcertdir, 0xFFF1, 0x8000)
 
     builder.make_certs_and_keys()
-    [h_full, c_full] = builder.full_arrays()
     [h_generic, c_generic] = builder.generic_arrays()
     [h_top, c_top] = builder.headers(args.paiout)
     footer = builder.footer()
     with open(args.outdir + args.paiout + '.h', "w") as hfile:
-        hfile.write(h_top)
-        hfile.write(h_full)
-        hfile.write(h_generic)
-        hfile.write(footer)
-    with open(args.outdir + args.paiout + '.cpp', "w") as cfile:
-        cfile.write(c_top)
-        cfile.write(c_full)
-        cfile.write(c_generic)
-        cfile.write(footer)
-
-    with open(args.outdir + args.dacout + '.h', "w") as hfile:
-        with open(args.outdir + args.dacout + '.cpp', "w") as cfile:
-            builder = DevCertBuilder(
-                CertType.DAC, args.certdir, args.testdir, args.chipcertdir, 0x8000)
-            [h_top, c_top] = builder.headers(args.dacout)
-            [h_generic, c_generic] = builder.generic_arrays()
-            footer = builder.footer()
-
+        with open(args.outdir + args.paiout + '.cpp', "w") as cfile:
             hfile.write(h_top)
             hfile.write(h_generic)
             cfile.write(c_top)
 
-            for i in range(0x8000, 0x8020):
-                builder = DevCertBuilder(
-                    CertType.DAC, args.certdir, args.testdir, args.chipcertdir, i)
+            for vid in range(0xFFF1, 0xFFF4):
+                builder = DevCertBuilder(CertType.PAI, args.certdir,
+                                         args.testdir, args.chipcertdir, vid, 0x8000)
                 builder.make_certs_and_keys()
-                [h, c] = builder.full_arrays()
+                [h_full, c_full] = builder.full_arrays()
                 [h_generic, c_generic] = builder.generic_arrays()
 
-                define = '#if CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x{:X}\n'.format(
-                    i)
+                define = '#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0x{:X}\n'.format(vid)
                 end = '#endif\n'
 
                 hfile.write(define)
-                hfile.write(h)
+                hfile.write(h_full)
                 hfile.write(end)
 
                 cfile.write(define)
-                cfile.write(c)
+                cfile.write(c_full)
                 cfile.write(c_generic)
                 cfile.write(end)
 
             hfile.write(footer)
             cfile.write(footer)
 
+    with open(args.outdir + args.dacout + '.h', "w") as hfile:
+        with open(args.outdir + args.dacout + '.cpp', "w") as cfile:
+            builder = DevCertBuilder(
+                CertType.DAC, args.certdir, args.testdir, args.chipcertdir, 0xFFF1, 0x8000)
+            [h_top, c_top] = builder.headers(args.dacout)
+            [h_generic, c_generic] = builder.generic_arrays()
+            footer = builder.footer()
+
+            hfile.write(h_top)
+            hfile.write(h_generic)
+            cfile.write(c_top)
+
+            for vid in range(0xFFF1, 0xFFF4):
+                for pid in range(0x8000, 0x8020):
+                    builder = DevCertBuilder(
+                        CertType.DAC, args.certdir, args.testdir, args.chipcertdir, vid, pid)
+                    builder.make_certs_and_keys()
+                    [h, c] = builder.full_arrays()
+                    [h_generic, c_generic] = builder.generic_arrays()
+
+                    define = '#if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0x{:X} && CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID == 0x{:X}\n'.format(
+                        vid, pid)
+                    end = '#endif\n'
+
+                    hfile.write(define)
+                    hfile.write(h)
+                    hfile.write(end)
+
+                    cfile.write(define)
+                    cfile.write(c)
+                    cfile.write(c_generic)
+                    cfile.write(end)
+
+            hfile.write(footer)
+            cfile.write(footer)
+
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/third_party/mt793x_sdk/mDNSResponder b/third_party/mt793x_sdk/mDNSResponder
index c366935b33afbb..b7af4daff94ec9 160000
--- a/third_party/mt793x_sdk/mDNSResponder
+++ b/third_party/mt793x_sdk/mDNSResponder
@@ -1 +1 @@
-Subproject commit c366935b33afbbfb6a4434163005c0b956a4a02d
+Subproject commit b7af4daff94ec978b76f5a4b8590c05cd6c07524
diff --git a/third_party/openthread/repo b/third_party/openthread/repo
index 7f0b5fac4b9e95..d2d9aff0127466 160000
--- a/third_party/openthread/repo
+++ b/third_party/openthread/repo
@@ -1 +1 @@
-Subproject commit 7f0b5fac4b9e95dfe96a2d61a4469c9fe8ec4802
+Subproject commit d2d9aff01274663d673c3cdceddeac16c1380a5d
diff --git a/third_party/silabs/BUILD.gn b/third_party/silabs/BUILD.gn
index e78442dd164945..0ced1ac6826680 100644
--- a/third_party/silabs/BUILD.gn
+++ b/third_party/silabs/BUILD.gn
@@ -45,6 +45,7 @@ config("silabs_config") {
 
 group("efr32_sdk") {
   public_deps = [ efr32_sdk_target ]
+  public_configs = [ ":silabs_config" ]
 }
 
 # Openthread GSDK libraries configurations
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 8df5af655ff761..aad94965ef1bd6 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -70473,7 +70473,7 @@ class TestSystemCommandsSuite : public TestCommand
 class TestBindingSuite : public TestCommand
 {
 public:
-    TestBindingSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestBinding", 9, credsIssuerConfig)
+    TestBindingSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestBinding", 10, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -70608,6 +70608,9 @@ class TestBindingSuite : public TestCommand
                 }
             }
             break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
+            break;
         default:
             LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
         }
@@ -70740,6 +70743,109 @@ class TestBindingSuite : public TestCommand
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Binding::Id, Binding::Attributes::Binding::Id, true,
                                  chip::NullOptional);
         }
+        case 9: {
+            LogStep(9, "Write over-long binding table on endpoint 1");
+            ListFreer listFreer;
+            chip::app::DataModel::List<const chip::app::Clusters::Binding::Structs::TargetStruct::Type> value;
+
+            {
+                auto * listHolder_0 = new ListHolder<chip::app::Clusters::Binding::Structs::TargetStruct::Type>(11);
+                listFreer.add(listHolder_0);
+
+                listHolder_0->mList[0].node.Emplace();
+                listHolder_0->mList[0].node.Value() = 1ULL;
+                listHolder_0->mList[0].endpoint.Emplace();
+                listHolder_0->mList[0].endpoint.Value() = 1U;
+                listHolder_0->mList[0].cluster.Emplace();
+                listHolder_0->mList[0].cluster.Value() = 6UL;
+                listHolder_0->mList[0].fabricIndex     = 0U;
+
+                listHolder_0->mList[1].node.Emplace();
+                listHolder_0->mList[1].node.Value() = 2ULL;
+                listHolder_0->mList[1].endpoint.Emplace();
+                listHolder_0->mList[1].endpoint.Value() = 2U;
+                listHolder_0->mList[1].cluster.Emplace();
+                listHolder_0->mList[1].cluster.Value() = 6UL;
+                listHolder_0->mList[1].fabricIndex     = 0U;
+
+                listHolder_0->mList[2].node.Emplace();
+                listHolder_0->mList[2].node.Value() = 3ULL;
+                listHolder_0->mList[2].endpoint.Emplace();
+                listHolder_0->mList[2].endpoint.Value() = 3U;
+                listHolder_0->mList[2].cluster.Emplace();
+                listHolder_0->mList[2].cluster.Value() = 6UL;
+                listHolder_0->mList[2].fabricIndex     = 0U;
+
+                listHolder_0->mList[3].node.Emplace();
+                listHolder_0->mList[3].node.Value() = 4ULL;
+                listHolder_0->mList[3].endpoint.Emplace();
+                listHolder_0->mList[3].endpoint.Value() = 4U;
+                listHolder_0->mList[3].cluster.Emplace();
+                listHolder_0->mList[3].cluster.Value() = 6UL;
+                listHolder_0->mList[3].fabricIndex     = 0U;
+
+                listHolder_0->mList[4].node.Emplace();
+                listHolder_0->mList[4].node.Value() = 5ULL;
+                listHolder_0->mList[4].endpoint.Emplace();
+                listHolder_0->mList[4].endpoint.Value() = 5U;
+                listHolder_0->mList[4].cluster.Emplace();
+                listHolder_0->mList[4].cluster.Value() = 6UL;
+                listHolder_0->mList[4].fabricIndex     = 0U;
+
+                listHolder_0->mList[5].node.Emplace();
+                listHolder_0->mList[5].node.Value() = 6ULL;
+                listHolder_0->mList[5].endpoint.Emplace();
+                listHolder_0->mList[5].endpoint.Value() = 6U;
+                listHolder_0->mList[5].cluster.Emplace();
+                listHolder_0->mList[5].cluster.Value() = 6UL;
+                listHolder_0->mList[5].fabricIndex     = 0U;
+
+                listHolder_0->mList[6].node.Emplace();
+                listHolder_0->mList[6].node.Value() = 7ULL;
+                listHolder_0->mList[6].endpoint.Emplace();
+                listHolder_0->mList[6].endpoint.Value() = 7U;
+                listHolder_0->mList[6].cluster.Emplace();
+                listHolder_0->mList[6].cluster.Value() = 6UL;
+                listHolder_0->mList[6].fabricIndex     = 0U;
+
+                listHolder_0->mList[7].node.Emplace();
+                listHolder_0->mList[7].node.Value() = 8ULL;
+                listHolder_0->mList[7].endpoint.Emplace();
+                listHolder_0->mList[7].endpoint.Value() = 8U;
+                listHolder_0->mList[7].cluster.Emplace();
+                listHolder_0->mList[7].cluster.Value() = 6UL;
+                listHolder_0->mList[7].fabricIndex     = 0U;
+
+                listHolder_0->mList[8].node.Emplace();
+                listHolder_0->mList[8].node.Value() = 9ULL;
+                listHolder_0->mList[8].endpoint.Emplace();
+                listHolder_0->mList[8].endpoint.Value() = 9U;
+                listHolder_0->mList[8].cluster.Emplace();
+                listHolder_0->mList[8].cluster.Value() = 6UL;
+                listHolder_0->mList[8].fabricIndex     = 0U;
+
+                listHolder_0->mList[9].node.Emplace();
+                listHolder_0->mList[9].node.Value() = 10ULL;
+                listHolder_0->mList[9].endpoint.Emplace();
+                listHolder_0->mList[9].endpoint.Value() = 10U;
+                listHolder_0->mList[9].cluster.Emplace();
+                listHolder_0->mList[9].cluster.Value() = 6UL;
+                listHolder_0->mList[9].fabricIndex     = 0U;
+
+                listHolder_0->mList[10].node.Emplace();
+                listHolder_0->mList[10].node.Value() = 11ULL;
+                listHolder_0->mList[10].endpoint.Emplace();
+                listHolder_0->mList[10].endpoint.Value() = 11U;
+                listHolder_0->mList[10].cluster.Emplace();
+                listHolder_0->mList[10].cluster.Value() = 6UL;
+                listHolder_0->mList[10].fabricIndex     = 0U;
+
+                value =
+                    chip::app::DataModel::List<chip::app::Clusters::Binding::Structs::TargetStruct::Type>(listHolder_0->mList, 11);
+            }
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Binding::Id, Binding::Attributes::Binding::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
         }
         return CHIP_NO_ERROR;
     }
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 211cf0f0c7a45b..36318231e2cb0d 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -102449,6 +102449,10 @@ class TestBinding : public TestCommandBridge {
             ChipLogProgress(chipTool, " ***** Test Step 8 : Verify endpoint 1 not changed\n");
             err = TestVerifyEndpoint1NotChanged_8();
             break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Write over-long binding table on endpoint 1\n");
+            err = TestWriteOverLongBindingTableOnEndpoint1_9();
+            break;
         }
 
         if (CHIP_NO_ERROR != err) {
@@ -102487,6 +102491,9 @@ class TestBinding : public TestCommandBridge {
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
+            break;
         }
 
         // Go on to the next test.
@@ -102500,7 +102507,7 @@ class TestBinding : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 9;
+    const uint16_t mTestCount = 10;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -102790,6 +102797,100 @@ class TestBinding : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
+
+    CHIP_ERROR TestWriteOverLongBindingTableOnEndpoint1_9()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id bindingArgument;
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            temp_0[0] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[0]).node = [NSNumber numberWithUnsignedLongLong:1ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[0]).endpoint = [NSNumber numberWithUnsignedShort:1U];
+            ((MTRBindingClusterTargetStruct *) temp_0[0]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[1] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[1]).node = [NSNumber numberWithUnsignedLongLong:2ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[1]).endpoint = [NSNumber numberWithUnsignedShort:2U];
+            ((MTRBindingClusterTargetStruct *) temp_0[1]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[2] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[2]).node = [NSNumber numberWithUnsignedLongLong:3ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[2]).endpoint = [NSNumber numberWithUnsignedShort:3U];
+            ((MTRBindingClusterTargetStruct *) temp_0[2]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[3] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[3]).node = [NSNumber numberWithUnsignedLongLong:4ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[3]).endpoint = [NSNumber numberWithUnsignedShort:4U];
+            ((MTRBindingClusterTargetStruct *) temp_0[3]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[3]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[4] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[4]).node = [NSNumber numberWithUnsignedLongLong:5ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[4]).endpoint = [NSNumber numberWithUnsignedShort:5U];
+            ((MTRBindingClusterTargetStruct *) temp_0[4]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[4]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[5] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[5]).node = [NSNumber numberWithUnsignedLongLong:6ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[5]).endpoint = [NSNumber numberWithUnsignedShort:6U];
+            ((MTRBindingClusterTargetStruct *) temp_0[5]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[5]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[6] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[6]).node = [NSNumber numberWithUnsignedLongLong:7ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[6]).endpoint = [NSNumber numberWithUnsignedShort:7U];
+            ((MTRBindingClusterTargetStruct *) temp_0[6]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[6]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[7] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[7]).node = [NSNumber numberWithUnsignedLongLong:8ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[7]).endpoint = [NSNumber numberWithUnsignedShort:8U];
+            ((MTRBindingClusterTargetStruct *) temp_0[7]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[7]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[8] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[8]).node = [NSNumber numberWithUnsignedLongLong:9ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[8]).endpoint = [NSNumber numberWithUnsignedShort:9U];
+            ((MTRBindingClusterTargetStruct *) temp_0[8]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[8]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[9] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[9]).node = [NSNumber numberWithUnsignedLongLong:10ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[9]).endpoint = [NSNumber numberWithUnsignedShort:10U];
+            ((MTRBindingClusterTargetStruct *) temp_0[9]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[9]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            temp_0[10] = [[MTRBindingClusterTargetStruct alloc] init];
+            ((MTRBindingClusterTargetStruct *) temp_0[10]).node = [NSNumber numberWithUnsignedLongLong:11ULL];
+            ((MTRBindingClusterTargetStruct *) temp_0[10]).endpoint = [NSNumber numberWithUnsignedShort:11U];
+            ((MTRBindingClusterTargetStruct *) temp_0[10]).cluster = [NSNumber numberWithUnsignedInt:6UL];
+            ((MTRBindingClusterTargetStruct *) temp_0[10]).fabricIndex = [NSNumber numberWithUnsignedChar:0U];
+
+            bindingArgument = temp_0;
+        }
+        [cluster
+            writeAttributeBindingWithValue:bindingArgument
+                                completion:^(NSError * _Nullable err) {
+                                    NSLog(@"Write over-long binding table on endpoint 1 Error: %@", err);
+
+                                    VerifyOrReturn(CheckValue("status",
+                                        err ? ([err.domain isEqualToString:MTRInteractionErrorDomain] ? err.code
+                                                                                                      : EMBER_ZCL_STATUS_FAILURE)
+                                            : 0,
+                                        EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED));
+                                    NextTest();
+                                }];
+
+        return CHIP_NO_ERROR;
+    }
 };
 
 class TestUserLabelCluster : public TestCommandBridge {