diff --git a/.github/scripts/validate_fingerprints.py b/.github/scripts/validate_fingerprints.py
new file mode 100644
index 0000000000..4b7dbc12b2
--- /dev/null
+++ b/.github/scripts/validate_fingerprints.py
@@ -0,0 +1,361 @@
+#!/usr/bin/env python3
+"""
+Validate fingerprints.yml files changed in a PR.
+
+Required fields per manufacturer section:
+  matterManufacturer  → id, deviceLabel, vendorId, productId, deviceProfileName
+  zigbeeManufacturer  → id, deviceLabel, manufacturer, model, deviceProfileName
+  zwaveManufacturer   → id, deviceLabel, manufacturerId, deviceProfileName
+                        + at least one of: productId, productType
+
+Hex fields (vendorId, productId, productType, manufacturerId) must use 0xNNNN notation.
+String fields must not be empty or have leading/trailing whitespace.
+id values that contain YAML-special characters must be quoted.
+
+Indentation rules (spaces only, no tabs):
+  Section key:               col 0   e.g. "matterManufacturer:"
+  Entry opening (- id: ...): 2-space e.g. "  - id: ..."
+  All other entry fields:    4-space e.g. "    vendorId: 0x115F"
+
+No trailing whitespace on any line.
+No duplicate id values within a file.
+
+Generic sections (zigbeeGeneric, zwaveGeneric, matterGeneric, etc.) are skipped.
+
+Usage:
+  python3 tools/validate_fingerprints.py                      # auto-detect via git diff
+  python3 tools/validate_fingerprints.py path/fingerprints.yml ...
+"""
+
+import os
+import re
+import sys
+import subprocess
+from pathlib import Path
+
+try:
+    import yaml
+except ImportError:
+    print("Error: pyyaml is required.  pip install pyyaml", file=sys.stderr)
+    sys.exit(2)
+
+# ── Section configuration ─────────────────────────────────────────────────────
+
+MANUFACTURER_SECTIONS = {'matterManufacturer', 'zigbeeManufacturer', 'zwaveManufacturer'}
+
+# All fields that must be present in every entry for each section.
+# Z-Wave also needs productId OR productType (checked separately).
+REQUIRED_FIELDS = {
+    'matterManufacturer': ['id', 'deviceLabel', 'vendorId', 'productId', 'deviceProfileName'],
+    # manufacturer and model are checked together below: at least one must be present
+    'zigbeeManufacturer': ['id', 'deviceLabel', 'deviceProfileName'],
+    'zwaveManufacturer':  ['id', 'deviceLabel', 'manufacturerId', 'deviceProfileName'],
+}
+
+# These fields must be formatted as hex literals (0xNNNN).
+HEX_FIELDS = {'vendorId', 'productId', 'productType', 'manufacturerId'}
+
+# YAML characters that force quoting when present in an unquoted scalar.
+_YAML_SPECIAL_RE = re.compile(r'[:{}\[\],&#*?|<>=!%@`]')
+
+# Matches a valid hex literal.
+_HEX_RE = re.compile(r'^0x[0-9A-Fa-f]+$')
+
+# Matches a field line:  (indent)(key): (value)
+_FIELD_RE = re.compile(r'^( *)([\w]+): *(.*?) *$')
+
+
+# ── Raw-text analysis ─────────────────────────────────────────────────────────
+
+def analyse_lines(lines, filepath):
+    """
+    Single-pass raw-line analysis. Returns a list of errors and a dict:
+      section_entry_lines[section] = list of (lineno, field, raw_value)
+    for structured cross-checking later.
+    """
+    errors = []
+    section = None                    # current top-level key
+    entry_indent = None               # indent of the "  - id:" line for current entry
+    in_manufacturer_section = False
+
+    for lineno, raw in enumerate(lines, 1):
+        line = raw.rstrip('\n')
+
+        # ── No tabs ───────────────────────────────────────────────────────────
+        if '\t' in line:
+            errors.append(f"{filepath}:{lineno}: tab character found (use spaces)")
+
+        # ── Trailing whitespace ───────────────────────────────────────────────
+        if line != line.rstrip():
+            errors.append(f"{filepath}:{lineno}: trailing whitespace")
+
+        stripped = line.strip()
+        if not stripped or stripped.startswith('#'):
+            continue
+
+        indent = len(line) - len(line.lstrip())
+
+        # ── Top-level section key detection ───────────────────────────────────
+        if indent == 0 and line.endswith(':') and not line.startswith(' '):
+            section = line[:-1].strip()
+            in_manufacturer_section = section in MANUFACTURER_SECTIONS
+            entry_indent = None
+            continue
+
+        if not in_manufacturer_section:
+            continue
+
+        # ── Entry opening line:  "  - id: ..." ───────────────────────────────
+        if stripped.startswith('- '):
+            if indent != 2:
+                errors.append(
+                    f"{filepath}:{lineno}: [{section}] entry list item must be indented "
+                    f"2 spaces, found {indent}"
+                )
+            entry_indent = indent
+
+            # Check that this is the id field
+            rest = stripped[2:]  # strip "- "
+            m = _FIELD_RE.match('  ' + rest)  # re-prefix spaces for consistent match
+            if m:
+                field = m.group(2)
+                raw_val = m.group(3)
+                if field == 'id':
+                    _check_id_quoting(raw_val, lineno, section, filepath, errors)
+            continue
+
+        # ── Subsequent fields of an entry ─────────────────────────────────────
+        if entry_indent is not None:
+            expected_indent = entry_indent + 2  # 2 + 2 = 4
+            if indent != expected_indent:
+                errors.append(
+                    f"{filepath}:{lineno}: [{section}] field must be indented "
+                    f"{expected_indent} spaces, found {indent}"
+                )
+
+            m = _FIELD_RE.match(line)
+            if not m:
+                continue
+            field = m.group(2)
+            raw_val = m.group(3).split('#')[0].strip()  # strip inline comment
+
+            # ── Hex field format ──────────────────────────────────────────────
+            if field in HEX_FIELDS and raw_val:
+                if not _HEX_RE.match(raw_val):
+                    errors.append(
+                        f"{filepath}:{lineno}: [{section}] field '{field}' "
+                        f"value {raw_val!r} must be hex notation (e.g. 0x115F)"
+                    )
+
+            # ── String field whitespace ───────────────────────────────────────
+            display_val = _strip_quotes(raw_val)
+            if field not in HEX_FIELDS and raw_val:
+                if display_val != display_val.strip():
+                    errors.append(
+                        f"{filepath}:{lineno}: [{section}] field '{field}' "
+                        f"value has leading/trailing whitespace: {raw_val!r}"
+                    )
+
+    return errors
+
+
+def _strip_yaml_inline_comment(raw_val):
+    """
+    Strip an inline YAML comment from a raw scalar value.
+
+    Handles:
+      "quoted value" # comment  →  "quoted value"
+      'quoted value' # comment  →  'quoted value'
+      bare value # comment      →  bare value
+    """
+    if raw_val and raw_val[0] in ('"', "'"):
+        q = raw_val[0]
+        i = 1
+        while i < len(raw_val):
+            ch = raw_val[i]
+            if q == '"' and ch == '\\':
+                i += 2  # skip escaped character
+                continue
+            if q == "'" and ch == "'" and i + 1 < len(raw_val) and raw_val[i + 1] == "'":
+                i += 2  # escaped single-quote inside single-quoted string
+                continue
+            if ch == q:
+                return raw_val[:i + 1]  # return up to and including closing quote
+            i += 1
+        return raw_val  # unclosed quote — return as-is
+    # Unquoted: strip from ' #' (space + hash = inline comment marker)
+    idx = raw_val.find(' #')
+    if idx != -1:
+        return raw_val[:idx].rstrip()
+    return raw_val
+
+
+def _check_id_quoting(raw_val, lineno, section, filepath, errors):
+    """Require quoting when the id value contains YAML-special characters."""
+    raw_val = _strip_yaml_inline_comment(raw_val)
+    is_quoted = (
+        len(raw_val) >= 2
+        and raw_val[0] in ('"', "'")
+        and raw_val[-1] == raw_val[0]
+    )
+    inner = raw_val[1:-1] if is_quoted else raw_val
+    if not is_quoted and _YAML_SPECIAL_RE.search(inner):
+        errors.append(
+            f"{filepath}:{lineno}: [{section}] id value {raw_val!r} contains "
+            f"special characters and must be quoted"
+        )
+
+
+def _strip_quotes(val):
+    if len(val) >= 2 and val[0] in ('"', "'") and val[-1] == val[0]:
+        return val[1:-1]
+    return val
+
+
+# ── YAML structural checks ────────────────────────────────────────────────────
+
+def check_structure(data, filepath):
+    errors = []
+
+    for section, entries in data.items():
+        if section not in MANUFACTURER_SECTIONS:
+            continue
+
+        if not isinstance(entries, list):
+            errors.append(f"{filepath}: [{section}] expected a list of entries, got {type(entries).__name__}")
+            continue
+
+        seen_ids = {}
+        for entry in entries:
+            if not isinstance(entry, dict):
+                errors.append(f"{filepath}: [{section}] entry is not a mapping: {entry!r}")
+                continue
+
+            entry_id = entry.get('id', '<missing>')
+
+            # ── Duplicate id ──────────────────────────────────────────────────
+            if entry_id in seen_ids:
+                errors.append(f"{filepath}: [{section}] duplicate id {entry_id!r}")
+            seen_ids[entry_id] = True
+
+            # ── Required fields ───────────────────────────────────────────────
+            # manufacturer and model may legitimately be "" (device reports no value).
+            ALLOW_EMPTY = {'manufacturer', 'model'}
+            for field in REQUIRED_FIELDS[section]:
+                if field not in entry:
+                    errors.append(
+                        f"{filepath}: [{section}] id={entry_id!r}: "
+                        f"missing required field '{field}'"
+                    )
+                elif entry[field] is None:
+                    errors.append(
+                        f"{filepath}: [{section}] id={entry_id!r}: "
+                        f"field '{field}' has a null value"
+                    )
+                elif field not in ALLOW_EMPTY and isinstance(entry[field], str) and entry[field].strip() == '':
+                    errors.append(
+                        f"{filepath}: [{section}] id={entry_id!r}: "
+                        f"field '{field}' is empty"
+                    )
+
+            # ── Zigbee: manufacturer or model ─────────────────────────────────
+            if section == 'zigbeeManufacturer':
+                mfr = entry.get('manufacturer')
+                mdl = entry.get('model')
+                mfr_blank = mfr is None or (isinstance(mfr, str) and mfr.strip() == '')
+                mdl_blank = mdl is None or (isinstance(mdl, str) and mdl.strip() == '')
+                if mfr_blank and mdl_blank:
+                    errors.append(
+                        f"{filepath}: [{section}] id={entry_id!r}: "
+                        "at least one of 'manufacturer' or 'model' must be provided"
+                    )
+
+            # ── Z-Wave: productId or productType ──────────────────────────────
+            if section == 'zwaveManufacturer':
+                if 'productId' not in entry and 'productType' not in entry:
+                    errors.append(
+                        f"{filepath}: [{section}] id={entry_id!r}: "
+                        "missing 'productId' or 'productType' (at least one required)"
+                    )
+
+    return errors
+
+
+# ── File validator ────────────────────────────────────────────────────────────
+
+def validate_file(filepath: Path) -> list:
+    try:
+        raw = filepath.read_text(encoding='utf-8')
+    except OSError as exc:
+        return [f"{filepath}: cannot read file — {exc}"]
+
+    lines = raw.splitlines(keepends=True)
+
+    # Raw-text pass (indentation, whitespace, hex format, id quoting)
+    errors = analyse_lines(lines, str(filepath))
+
+    # YAML structural pass (required fields, duplicates, null/empty values)
+    try:
+        data = yaml.safe_load(raw)
+    except yaml.YAMLError as exc:
+        return errors + [f"{filepath}: YAML parse error — {exc}"]
+
+    if not isinstance(data, dict):
+        return errors + [f"{filepath}: unexpected top-level YAML structure"]
+
+    errors.extend(check_structure(data, str(filepath)))
+    return errors
+
+
+# ── Git helper ────────────────────────────────────────────────────────────────
+
+def get_changed_files() -> list:
+    base = os.environ.get('GITHUB_BASE_REF', 'main')
+    for ref in (f'origin/{base}', base, 'HEAD~1'):
+        try:
+            result = subprocess.run(
+                ['git', 'diff', '--name-only', '--diff-filter=AM', f'{ref}...HEAD'],
+                capture_output=True, text=True, check=True
+            )
+            return [
+                Path(f) for f in result.stdout.splitlines()
+                if f.endswith('fingerprints.yml') and Path(f).exists()
+            ]
+        except subprocess.CalledProcessError:
+            continue
+    return []
+
+
+# ── Main ──────────────────────────────────────────────────────────────────────
+
+def main():
+    if len(sys.argv) > 1:
+        files = [Path(f) for f in sys.argv[1:]]
+    else:
+        files = get_changed_files()
+        if not files:
+            print("No changed fingerprints.yml files detected.")
+            sys.exit(0)
+
+    all_errors = []
+    for f in files:
+        if not f.exists():
+            print(f"Warning: {f} does not exist, skipping", file=sys.stderr)
+            continue
+        print(f"Checking {f} ...")
+        errs = validate_file(f)
+        all_errors.extend(errs)
+
+    if all_errors:
+        print()
+        for err in all_errors:
+            print(err)
+        print(f"\n✗ {len(all_errors)} error(s) found.")
+        sys.exit(1)
+    else:
+        print(f"\n✓ {len(files)} file(s) passed validation.")
+        sys.exit(0)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/.github/workflows/validate-fingerprints.yml b/.github/workflows/validate-fingerprints.yml
new file mode 100644
index 0000000000..6fc32268bd
--- /dev/null
+++ b/.github/workflows/validate-fingerprints.yml
@@ -0,0 +1,24 @@
+name: Validate fingerprints
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - 'drivers/**/fingerprints.yml'
+
+jobs:
+  validate-fingerprints:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install pyyaml
+        run: pip install pyyaml --quiet
+
+      - name: Validate changed fingerprints.yml files
+        env:
+          GITHUB_BASE_REF: ${{ github.base_ref }}
+        run: python .github/scripts/validate_fingerprints.py
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000000..eef4bd20cf
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1 @@
+@AGENTS.md
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 752d3d358c..cedacdf64d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ def getDockerCredentialId() {
     def nodeLabel = params.NODE_LABEL ?: 'production'
     def region = get_region()
     if (nodeLabel == 'production' && region == 'cn') {
-      return 'artifactory-credentials'
+      return 'artifactory-cn'
     }
     else {
       return ''
diff --git a/drivers/SmartThings/hub/fingerprints.yml b/drivers/SmartThings/hub/fingerprints.yml
index 317df13f8b..887f1a4455 100644
--- a/drivers/SmartThings/hub/fingerprints.yml
+++ b/drivers/SmartThings/hub/fingerprints.yml
@@ -17,7 +17,7 @@ hub:
     deviceProfileName: washer-dryer-hub
   - id: "cooktop-hub"
     deviceLabel: SmartThings Hub
-    hardwareType: SAMSUNG_COOKTOP_TIZEN_OPEN 
+    hardwareType: SAMSUNG_COOKTOP_TIZEN_OPEN
     deviceProfileName: cooktop-hub
   - id: "v4-hub"
     deviceLabel: SmartThings Hub
diff --git a/drivers/SmartThings/matter-lock/src/init.lua b/drivers/SmartThings/matter-lock/src/init.lua
index f94702c496..72bfaae425 100755
--- a/drivers/SmartThings/matter-lock/src/init.lua
+++ b/drivers/SmartThings/matter-lock/src/init.lua
@@ -1313,7 +1313,10 @@ local function get_user_response_handler(driver, device, ib, response)
   end
 
   local ep = find_default_endpoint(device, DoorLock.ID)
-  local status = elements.user_status.value
+  local status = nil
+  if elements.user_status ~= nil then
+    status = elements.user_status.value
+  end
   local maxUser = device:get_latest_state(
     "main",
     capabilities.lockUsers.ID,
@@ -1624,11 +1627,11 @@ local function set_pin_response_handler(driver, device, ib, response)
 
     -- If user is added also, update User table
     if userIdx == nil then
+      userIdx = elements.user_index.value
       add_user_to_table(device, elements.user_index.value, nil, userType)
     end
 
     -- Update Credential table
-    userIdx = elements.user_index.value
     if cmdName == "addCredential" then
       add_credential_to_table(device, userIdx, credIdx, "pin")
     end
diff --git a/drivers/SmartThings/matter-sensor/fingerprints.yml b/drivers/SmartThings/matter-sensor/fingerprints.yml
index 45b21dd386..dc42ad4b07 100644
--- a/drivers/SmartThings/matter-sensor/fingerprints.yml
+++ b/drivers/SmartThings/matter-sensor/fingerprints.yml
@@ -89,6 +89,11 @@ matterManufacturer:
     vendorId: 0x120B
     productId: 0x1060
     deviceProfileName: temperature-humidity-battery
+  - id: "4619/4129"
+    deviceLabel: Photoelectric Smoke Alarm
+    vendorId: 0x120B
+    productId: 0x1021
+    deviceProfileName: smoke-battery
   # Ikea
   - id: "4476/32773"
     deviceLabel: TIMMERFLOTTE Temperature/Humidity Sensor
diff --git a/drivers/SmartThings/matter-switch/fingerprints.yml b/drivers/SmartThings/matter-switch/fingerprints.yml
index c5888f51da..fd2a35c321 100644
--- a/drivers/SmartThings/matter-switch/fingerprints.yml
+++ b/drivers/SmartThings/matter-switch/fingerprints.yml
@@ -2395,11 +2395,6 @@ matterManufacturer:
     vendorId: 0x100b
     productId: 0x21B3
     deviceProfileName: light-color-level-2200K-6500K
-  - id: "4107/8627"
-    deviceLabel: WiZ Downlight
-    vendorId: 0x100b
-    productId: 0x21B3
-    deviceProfileName: light-color-level-2200K-6500K
   - id: "4107/8796"
     deviceLabel: WiZ Downlight
     vendorId: 0x100b
@@ -4258,6 +4253,16 @@ matterManufacturer:
     vendorId: 0x1397
     productId: 0x07E7
     deviceProfileName: matter-bridge
+  - id: "5015/2040"
+    deviceLabel: SwitchBot Color Lighting
+    vendorId: 0x1397
+    productId: 0x07F8
+    deviceProfileName: light-color-level
+  - id: "5015/2039"
+    deviceLabel: SwitchBot Floor Lamp
+    vendorId: 0x1397
+    productId: 0x07F7
+    deviceProfileName: light-color-level
   - id: "Nature/Bridge"
     deviceLabel: Matter Bridge
     vendorId: 0x138A
@@ -4301,6 +4306,11 @@ matterManufacturer:
     vendorId: 0x1664
     productId: 0x0600
     deviceProfileName: light-color-level
+  - id: "5732/768"
+    deviceLabel: Utilitech 1x4 Smart Panel  - Full Color
+    vendorId: 0x1664
+    productId: 0x0300
+    deviceProfileName: light-color-level
 
 
 matterGeneric:
diff --git a/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua b/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua
index 08402cf273..a78a2375c0 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua
@@ -4,8 +4,6 @@
 local test = require "integration_test"
 local t_utils = require "integration_test.utils"
 local capabilities = require "st.capabilities"
-local utils = require "st.utils"
-local dkjson = require "dkjson"
 local clusters = require "st.matter.clusters"
 local version = require "version"
 
@@ -205,19 +203,16 @@ local function test_init()
     parent_assigned_child_key = string.format("%d", aqara_child2_ep)
   })
 
-  local device_info_copy = utils.deep_copy(aqara_mock_device.raw_st_data)
-  device_info_copy.profile.id = "4-button"
-  local device_info_json = dkjson.encode(device_info_copy)
-  test.socket.device_lifecycle:__queue_receive({ aqara_mock_device.id, "infoChanged", device_info_json })
-  configure_buttons()
-  test.socket.matter:__expect_send({aqara_mock_device.id, subscribe_request})
+  test.socket.device_lifecycle:__queue_receive(aqara_mock_device:generate_info_changed({profile = t_utils.get_profile_definition("4-button.yml")}))
 end
 
+
 test.set_test_init_function(test_init)
 
 test.register_coroutine_test(
   "Button/Switch device : button/switch capability should send the appropriate commands",
     function()
+      test.wait_for_events()
       test.socket.matter:__queue_receive(
         {
           aqara_mock_device.id,
diff --git a/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua b/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua
index a85137d0e3..4aeee85023 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua
@@ -494,10 +494,13 @@ local function button_supported_values (matter_device)
   test.socket.capability:__expect_send(matter_device:generate_test_message("button4", capabilities.button.supportedButtonValues({ "pushed", "double", "held" })))
 end
 
-local function initiate_info_changed(device, profile)
+local function initiate_info_changed(device, profile, parent)
   test.socket.device_lifecycle:__queue_receive(device:generate_info_changed({ profile = { id = profile } }))
   test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
   test.mock_time.advance_time(2)
+  if parent ~= nil then
+    test.socket.device_lifecycle:__queue_receive(parent:generate_info_changed({}))
+  end
 end
 
 local function configure_parent(device)
@@ -1432,7 +1435,7 @@ test.register_coroutine_test("Test: PIR Device - Complete Functionality with Mot
   })
 
   test.mock_device.add_test_device(child_dimmer)
-  initiate_info_changed(child_dimmer, "light-level")
+  initiate_info_changed(child_dimmer, "light-level", parent_pir)
   test.socket.matter:__expect_send({
     parent_pir.id,
     cluster_base.subscribe(parent_pir, nil, clusters.OnOff.ID, clusters.OnOff.attributes.OnOff.ID, nil)
@@ -1558,7 +1561,7 @@ test.register_coroutine_test("Test: Host with Window Covering - 2-Button Profile
   })
 
   test.mock_device.add_test_device(child_wc)
-  initiate_info_changed(child_wc, "window-covering")
+  initiate_info_changed(child_wc, "window-covering", parent)
 
   test.socket.matter:__expect_send({
     parent.id,
@@ -1725,6 +1728,7 @@ test.register_coroutine_test("Test: Window Covering - Preference Changes for Rev
 
   test.socket.device_lifecycle():__queue_receive(child_wc:generate_info_changed({ preferences = { reverse = "false" } }))
   test.socket.device_lifecycle():__queue_receive(child_wc:generate_info_changed({ preferences = { reverse = "true" } }))
+  test.socket.device_lifecycle():__queue_receive(parent:generate_info_changed({ }))
   test.wait_for_events()
   local reverse_preference_set = child_wc.preferences.reverse
   assert(reverse_preference_set == "true", "reverse_preference_set is True")
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua
index b3390edc29..1c9e901277 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua
@@ -419,17 +419,20 @@ test.register_coroutine_test(
   "Test driver switched event",
   function()
     test.mock_device.add_test_device(mock_child)
+    test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed({}))
+    test.wait_for_events()
     test.socket.device_lifecycle:__queue_receive({ mock_device.id, "init" })
+
     local subscribe_request = CLUSTER_SUBSCRIBE_LIST_WITH_CHILD[1]:subscribe(mock_device)
-    for i, clus in ipairs(CLUSTER_SUBSCRIBE_LIST_WITH_CHILD) do
-      if i > 1 then subscribe_request:merge(clus:subscribe(mock_device)) end
-    end
-    test.socket.matter:__expect_send({mock_device.id, subscribe_request})
-    test.socket.device_lifecycle:__queue_receive({ mock_device.id, "driverSwitched" })
-    mock_child:expect_metadata_update({ profile = "light-color-level" })
-    mock_device:expect_metadata_update({ profile = "light-level-3-button" })
-    expect_configure_buttons()
-    mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
+     for i, clus in ipairs(CLUSTER_SUBSCRIBE_LIST_WITH_CHILD) do
+       if i > 1 then subscribe_request:merge(clus:subscribe(mock_device)) end
+     end
+     test.socket.matter:__expect_send({mock_device.id, subscribe_request})
+     test.socket.device_lifecycle:__queue_receive({ mock_device.id, "driverSwitched" })
+     mock_child:expect_metadata_update({ profile = "light-color-level" })
+     mock_device:expect_metadata_update({ profile = "light-level-3-button" })
+     expect_configure_buttons()
+     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
      min_api_version = 15
@@ -475,6 +478,7 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_device.id, clusters.OnOff.attributes.OnOff:read(mock_device)})
     test.socket.device_lifecycle:__queue_receive({ mock_child.id, "added" })
     test.socket.device_lifecycle:__queue_receive({ mock_child.id, "init" })
+    test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed({}))
     local subscribe_request = CLUSTER_SUBSCRIBE_LIST_WITH_CHILD[1]:subscribe(mock_device)
     for i, clus in ipairs(CLUSTER_SUBSCRIBE_LIST_WITH_CHILD) do
       if i > 1 then subscribe_request:merge(clus:subscribe(mock_device)) end
diff --git a/drivers/SmartThings/matter-window-covering/fingerprints.yml b/drivers/SmartThings/matter-window-covering/fingerprints.yml
index 34406cf01c..66b33f0bf7 100644
--- a/drivers/SmartThings/matter-window-covering/fingerprints.yml
+++ b/drivers/SmartThings/matter-window-covering/fingerprints.yml
@@ -255,6 +255,12 @@ matterManufacturer:
     vendorId: 0x1523
     productId: 0x0A69
     deviceProfileName: window-covering-battery
+#3L Smart
+  - id: "5412/48897"
+    deviceLabel: Blinds motor
+    vendorId: 0x1524
+    productId: 0xBF01
+    deviceProfileName: window-covering-battery
 matterGeneric:
   - id: "windowcovering"
     deviceLabel: Matter Window Covering
diff --git a/drivers/SmartThings/sonos/src/api/sonos_connection.lua b/drivers/SmartThings/sonos/src/api/sonos_connection.lua
index 6a131c3b0c..4852fc517c 100644
--- a/drivers/SmartThings/sonos/src/api/sonos_connection.lua
+++ b/drivers/SmartThings/sonos/src/api/sonos_connection.lua
@@ -547,6 +547,8 @@ function SonosConnection.new(driver, device)
   self.on_close = function(_)
     log.debug(string.format("OnClose for %s", device_name))
     if self._initialized then
+      self._initialized = false
+      log.debug(string.format("Marking %s as offline due to websocket closure", device_name))
       self.device:offline()
     end
     if self._keepalive then
@@ -566,10 +568,10 @@ function SonosConnection:is_running()
     string.format(
       "%s all connections running? %s",
       self.device.label,
-      st_utils.stringify_table({ coordinator = self_running, mine = self_running })
+      st_utils.stringify_table({ coordinator = coord_running, mine = self_running })
     )
   )
-  return self_running and coord_running
+  return self_running and coord_running and self._initialized
 end
 
 --- Whether or not the connection has a live websocket connection
@@ -586,7 +588,7 @@ function SonosConnection:self_running()
       )
     )
   end
-  return type(unique_key) == "string" and Router.is_connected(unique_key) and self._initialized
+  return type(unique_key) == "string" and Router.is_connected(unique_key)
 end
 
 --- Whether or not the connection has a live websocket connection to its coordinator
@@ -685,7 +687,7 @@ function SonosConnection:start()
   end
 
   if not self:coordinator_running() then
-    --TODO this is not infallible
+    --TODO this is not infallible, but is checked below
     _open_coordinator_socket(self, household_id, player_id, api_key)
   end
 
@@ -700,6 +702,7 @@ function SonosConnection:start()
     and coordinator_unique_key
     and Router.is_connected(coordinator_unique_key)
   then
+    log.debug(string.format("Marking %s as online since all websockets connected", self.device.label))
     self.device:online()
     self._initialized = true
     self._keepalive = true
diff --git a/drivers/SmartThings/sonos/src/api/sonos_websocket_router.lua b/drivers/SmartThings/sonos/src/api/sonos_websocket_router.lua
index c19e35274b..9ba4710a66 100644
--- a/drivers/SmartThings/sonos/src/api/sonos_websocket_router.lua
+++ b/drivers/SmartThings/sonos/src/api/sonos_websocket_router.lua
@@ -233,11 +233,11 @@ end
 ---@return string?
 function SonosWebSocketRouter.register_listener_for_socket(listener, unique_key_for_socket)
   if listener and listener.device and listener.device.label then
-    log.debug(
+    log.debug(string.format(
       "Registering SonosConnection for device %s as listener for player %s websocket",
       listener.device.label,
       unique_key_for_socket
-    )
+    ))
   end
   local ws = websockets[unique_key_for_socket]
 
diff --git a/drivers/SmartThings/zigbee-button/fingerprints.yml b/drivers/SmartThings/zigbee-button/fingerprints.yml
index 347fa818df..119b8a18ee 100644
--- a/drivers/SmartThings/zigbee-button/fingerprints.yml
+++ b/drivers/SmartThings/zigbee-button/fingerprints.yml
@@ -248,7 +248,7 @@ zigbeeManufacturer:
     deviceLabel: ITM Switch
     manufacturer: Samsung Electronics
     model: SAMSUNG-ITM-Z-005
-    deviceProfileName: SLED-three-buttons  
+    deviceProfileName: SLED-three-buttons
   - id: "Linxura Smart Controller"
     deviceLabel: Linxura Smart Controller
     manufacturer: Linxura
diff --git a/drivers/SmartThings/zigbee-smoke-detector/fingerprints.yml b/drivers/SmartThings/zigbee-smoke-detector/fingerprints.yml
index 6fce8d0d3a..837463ab08 100644
--- a/drivers/SmartThings/zigbee-smoke-detector/fingerprints.yml
+++ b/drivers/SmartThings/zigbee-smoke-detector/fingerprints.yml
@@ -5,7 +5,7 @@ zigbeeManufacturer:
     model: lumi.sensor_gas.acn02
     deviceProfileName: gas-lifetime-selfcheck-aqara
   - id: "LUMI/lumi.sensor_smoke.acn03"
-    deviceLabel: Aqara Smart Smoke Detector 
+    deviceLabel: Aqara Smart Smoke Detector
     manufacturer: LUMI
     model: lumi.sensor_smoke.acn03
     deviceProfileName: smoke-battery-aqara
diff --git a/drivers/SmartThings/zigbee-switch/fingerprints.yml b/drivers/SmartThings/zigbee-switch/fingerprints.yml
index bebe5295a2..613c471dcb 100644
--- a/drivers/SmartThings/zigbee-switch/fingerprints.yml
+++ b/drivers/SmartThings/zigbee-switch/fingerprints.yml
@@ -1744,7 +1744,7 @@ zigbeeManufacturer:
     deviceLabel: SMART ZIGBEE PLUG EU EM T
     manufacturer: LEDVANCE
     model: PLUG EU EM T
-    deviceProfileName: switch-power-energy    
+    deviceProfileName: switch-power-energy
   - id: "OSRAM/LIGHTIFY Edge-lit flushmount"
     deviceLabel: SYLVANIA Light
     manufacturer: OSRAM
@@ -2115,11 +2115,6 @@ zigbeeManufacturer:
     manufacturer: OSRAM
     model: CLA60 RGBW OSRAM
     deviceProfileName: rgbw-bulb
-  - id: "OSRAM/Flex RGBW"
-    deviceLabel: OSRAM Light
-    manufacturer: OSRAM
-    model: Flex RGBW
-    deviceProfileName: rgbw-bulb
   - id: "OSRAM/Gardenpole RGBW-Lightify"
     deviceLabel: OSRAM Light
     manufacturer: OSRAM
@@ -2230,11 +2225,6 @@ zigbeeManufacturer:
     manufacturer: IKEA of Sweden
     model: JORMLIEN door WS 40x80
     deviceProfileName: color-temp-bulb-2200K-4000K
-  - id: "OSRAM/Classic B40 TW - LIGHTIFY"
-    deviceLabel: OSRAM Light
-    manufacturer: OSRAM
-    model: Classic B40 TW - LIGHTIFY
-    deviceProfileName: color-temp-bulb
   - id: "OSRAM/CLA60 TW OSRAM"
     deviceLabel: OSRAM Light
     manufacturer: OSRAM
@@ -2552,6 +2542,22 @@ zigbeeManufacturer:
     manufacturer: FIRSTLED
     model: DC2DC12MiV1
     deviceProfileName: light-color-temp-time-restore
+#Legrand/BTicino
+  - id: Legrand/Micromodule switch
+    deviceLabel: Connected Lighting Micromodule
+    manufacturer: Legrand
+    model: Micromodule switch
+    deviceProfileName: basic-switch
+  - id: Legrand/Light switch with neutral
+    deviceLabel: Connected Switch with Neutral
+    manufacturer: Legrand
+    model: Light switch with neutral
+    deviceProfileName: basic-switch
+  - id: Legrand/Connected outlet
+    deviceLabel: Connected Socket
+    manufacturer: Legrand
+    model: Connected outlet
+    deviceProfileName: switch-power
 zigbeeGeneric:
   - id: "genericSwitch"
     deviceLabel: Zigbee Switch
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/fingerprints.yml b/drivers/SmartThings/zigbee-water-leak-sensor/fingerprints.yml
index e7007de4f7..9745b5c652 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/fingerprints.yml
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/fingerprints.yml
@@ -108,7 +108,7 @@ zigbeeManufacturer:
     deviceLabel: Sengled Water Leak Sensor
     manufacturer: sengled
     model: E1L-G7K
-    deviceProfileName: water-battery 
+    deviceProfileName: water-battery
   - id: NEO/NAS_WS11
     deviceLabel: NEO Water Leak Sensor
     manufacturer: NEO
diff --git a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_1_phase.lua b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_1_phase.lua
index f581f457df..484ba90c7c 100644
--- a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_1_phase.lua
+++ b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_1_phase.lua
@@ -128,7 +128,8 @@ test.register_coroutine_test(
         )
       end
     end
-  end
+  end,
+  {test_init = function() test.mock_device.add_test_device(mock_parent) end}
 )
 
 test.register_coroutine_test(
diff --git a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_2_phase.lua b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_2_phase.lua
index 43ea5cdbe3..7ab752246a 100644
--- a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_2_phase.lua
+++ b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_2_phase.lua
@@ -128,7 +128,8 @@ test.register_coroutine_test(
         )
       end
     end
-  end
+  end,
+  {test_init = function() test.mock_device.add_test_device(mock_parent) end}
 )
 
 test.register_coroutine_test(
diff --git a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_3_phase.lua b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_3_phase.lua
index 465e3add9f..c1fedbf717 100644
--- a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_3_phase.lua
+++ b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_home_energy_meter_gen8_3_phase.lua
@@ -128,7 +128,8 @@ test.register_coroutine_test(
         )
       end
     end
-  end
+  end,
+  {test_init = function() test.mock_device.add_test_device(mock_parent) end}
 )
 
 test.register_coroutine_test(
diff --git a/drivers/SmartThings/zwave-garage-door-opener/fingerprints.yml b/drivers/SmartThings/zwave-garage-door-opener/fingerprints.yml
index e15aee1a63..006334ea60 100644
--- a/drivers/SmartThings/zwave-garage-door-opener/fingerprints.yml
+++ b/drivers/SmartThings/zwave-garage-door-opener/fingerprints.yml
@@ -41,4 +41,4 @@ zwaveGeneric:
     commandClasses:
       supported:
         - 0x98
-    deviceProfileName: base-garage-door    
+    deviceProfileName: base-garage-door
diff --git a/drivers/SmartThings/zwave-switch/fingerprints.yml b/drivers/SmartThings/zwave-switch/fingerprints.yml
index 8719899d1d..77aba90d2c 100644
--- a/drivers/SmartThings/zwave-switch/fingerprints.yml
+++ b/drivers/SmartThings/zwave-switch/fingerprints.yml
@@ -971,7 +971,7 @@ zwaveManufacturer:
     manufacturerId: 0x0460
     productId: 0x0083
     productType: 0x0002
-    deviceProfileName: switch-binary 
+    deviceProfileName: switch-binary
   - id: 1120/2/132
     deviceLabel: Wave 1PM
     manufacturerId: 0x0460
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch_migration.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch_migration.lua
index ef2e4997b2..9b5328a748 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch_migration.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch_migration.lua
@@ -36,12 +36,15 @@ local mock_parent = test.mock_device.build_test_zwave_device({
   zwave_manufacturer_id = 0x0086,
   zwave_product_type = 0x0103,
   zwave_product_id = 0x008C,
-  child_ids = {
-    "abcdefghijklmnopq",
-    "12345678910111213"
-  }
 })
 
+local mock_child = test.mock_device.build_test_child_device({
+  profile = t_utils.get_profile_definition("switch-binary.yml"),
+  parent_device_id = mock_parent.id,
+  parent_assigned_child_key = string.format("%02X", 2)
+})
+
+
 local mock_parent_no_data = test.mock_device.build_test_zwave_device({
   label = "Aeotec Switch 1",
   profile = t_utils.get_profile_definition("switch-binary.yml"),
@@ -53,6 +56,7 @@ local mock_parent_no_data = test.mock_device.build_test_zwave_device({
 
 local function test_init()
   test.mock_device.add_test_device(mock_parent)
+  test.mock_device.add_test_device(mock_child)
   test.mock_device.add_test_device(mock_parent_no_data)
 end
 
diff --git a/drivers/SmartThings/zwave-virtual-momentary-switch/fingerprints.yml b/drivers/SmartThings/zwave-virtual-momentary-switch/fingerprints.yml
index b93e7f071a..b62288b90e 100644
--- a/drivers/SmartThings/zwave-virtual-momentary-switch/fingerprints.yml
+++ b/drivers/SmartThings/zwave-virtual-momentary-switch/fingerprints.yml
@@ -1,4 +1,3 @@
-zwaveManufacturer:
 zwaveGeneric:
 - id: "GenericSwitch/1"
   deviceLabel: Switch
diff --git a/drivers/SmartThings/zwave-window-treatment/fingerprints.yml b/drivers/SmartThings/zwave-window-treatment/fingerprints.yml
index 0eed587497..13c648f3e7 100644
--- a/drivers/SmartThings/zwave-window-treatment/fingerprints.yml
+++ b/drivers/SmartThings/zwave-window-treatment/fingerprints.yml
@@ -62,7 +62,7 @@ zwaveManufacturer:
     manufacturerId: 0x0115
     productId: 0x0010
     productType: 0x0211
-    deviceProfileName: window-treatment-preset-reverse  
+    deviceProfileName: window-treatment-preset-reverse
 zwaveGeneric:
   - id: window-treatment/generic/1
     deviceLabel: Z-Wave Window Treatment