diff --git a/drivers/SmartThings/matter-switch/fingerprints.yml b/drivers/SmartThings/matter-switch/fingerprints.yml
index fd2a35c321..a889663b92 100644
--- a/drivers/SmartThings/matter-switch/fingerprints.yml
+++ b/drivers/SmartThings/matter-switch/fingerprints.yml
@@ -241,6 +241,41 @@ matterManufacturer:
     vendorId: 0x1396
     productId: 0x11DE
     deviceProfileName: light-color-level
+  - id: "5014/4224"
+    deviceLabel: Linkind Smart Light Bulb
+    vendorId: 0x1396
+    productId: 0x1080
+    deviceProfileName: light-color-level
+  - id: "5014/4223"
+    deviceLabel: Linkind Smart Light Bulb
+    vendorId: 0x1396
+    productId: 0x107F
+    deviceProfileName: light-color-level
+  - id: "5014/4227"
+    deviceLabel: Linkind Smart Light Bulb
+    vendorId: 0x1396
+    productId: 0x1083
+    deviceProfileName: light-color-level
+  - id: "5014/4218"
+    deviceLabel: Linkind Smart Filament Bulb
+    vendorId: 0x1396
+    productId: 0x107A
+    deviceProfileName: light-color-level
+  - id: "5014/4220"
+    deviceLabel: Linkind Smart Filament Bulb
+    vendorId: 0x1396
+    productId: 0x107C
+    deviceProfileName: light-color-level
+  - id: "5014/4221"
+    deviceLabel: Linkind Smart Filament Bulb
+    vendorId: 0x1396
+    productId: 0x107D
+    deviceProfileName: light-color-level
+  - id: "5014/4713"
+    deviceLabel: Linkind Smart Outdoor Plug
+    vendorId: 0x1396
+    productId: 0x1269
+    deviceProfileName: plug-binary
 #Bosch Smart Home
   - id: "4617/12310"
     deviceLabel: Plug Compact [M]
diff --git a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/attribute_handlers.lua b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/attribute_handlers.lua
index 075f5cc487..0b08bf27b0 100644
--- a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/attribute_handlers.lua
+++ b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/attribute_handlers.lua
@@ -18,8 +18,6 @@ CameraAttributeHandlers.enabled_state_factory = function(attribute)
       camera_utils.update_supported_attributes(device, ib, capabilities.imageControl, "imageFlipHorizontal")
     elseif attribute == capabilities.imageControl.imageFlipVertical then
       camera_utils.update_supported_attributes(device, ib, capabilities.imageControl, "imageFlipVertical")
-    elseif attribute == capabilities.cameraPrivacyMode.hardPrivacyMode then
-      camera_utils.update_supported_attributes(device, ib, capabilities.cameraPrivacyMode, "hardPrivacyMode")
     end
   end
 end
@@ -59,10 +57,14 @@ end
 
 function CameraAttributeHandlers.volume_level_handler(driver, device, ib, response)
   local component = device:endpoint_to_component(ib)
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. component) or camera_fields.ABS_VOL_MAX
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. component) or camera_fields.ABS_VOL_MIN
-  -- Convert from [min_volume, max_volume] to [0, 100] before emitting capability
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, component) or camera_fields.ABS_VOL_MAX
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, component) or camera_fields.ABS_VOL_MIN
   local limited_range = max_volume - min_volume
+  if limited_range <= 0 then
+    device:emit_event_for_endpoint(ib, capabilities.audioVolume.volume(0))
+    return
+  end
+  -- Convert from [min_volume, max_volume] to [0, 100] before emitting capability
   local normalized_volume = utils.round((ib.data.value - min_volume) * 100.0 / limited_range)
   device:emit_event_for_endpoint(ib, capabilities.audioVolume.volume(normalized_volume))
 end
@@ -70,23 +72,33 @@ end
 function CameraAttributeHandlers.max_volume_level_handler(driver, device, ib, response)
   local component = device:endpoint_to_component(ib)
   local max_volume = ib.data.value
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. component)
-  if max_volume > camera_fields.ABS_VOL_MAX or (min_volume and max_volume <= min_volume) then
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, component)
+  -- min == max is a valid (non-adjustable) range per the Matter spec, so only max < min is malformed;
+  -- an out-of-bounds value is clamped, but a malformed relationship is only logged and left as-is,
+  -- since volume_level_handler already guards against a non-positive range.
+  if max_volume > camera_fields.ABS_VOL_MAX then
     device.log.warn(string.format("Device reported invalid maximum (%d) %s volume level range value", ib.data.value, component))
     max_volume = camera_fields.ABS_VOL_MAX
+  elseif min_volume and max_volume < min_volume then
+    device.log.warn(string.format("Device reported invalid maximum (%d) %s volume level range value", ib.data.value, component))
   end
-  device:set_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. component, max_volume)
+  camera_utils.set_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, component, max_volume)
+  camera_cfg.reconcile_profile_and_capabilities(device)
 end
 
 function CameraAttributeHandlers.min_volume_level_handler(driver, device, ib, response)
   local component = device:endpoint_to_component(ib)
   local min_volume = ib.data.value
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. component)
-  if min_volume < camera_fields.ABS_VOL_MIN or (max_volume and min_volume >= max_volume) then
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, component)
+  -- See max_volume_level_handler: min == max is valid, only min > max is malformed and only logged.
+  if min_volume < camera_fields.ABS_VOL_MIN then
     device.log.warn(string.format("Device reported invalid minimum (%d) %s volume level range value", ib.data.value, component))
     min_volume = camera_fields.ABS_VOL_MIN
+  elseif max_volume and min_volume > max_volume then
+    device.log.warn(string.format("Device reported invalid minimum (%d) %s volume level range value", ib.data.value, component))
   end
-  device:set_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. component, min_volume)
+  camera_utils.set_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, component, min_volume)
+  camera_cfg.reconcile_profile_and_capabilities(device)
 end
 
 function CameraAttributeHandlers.status_light_enabled_handler(driver, device, ib, response)
@@ -450,7 +462,7 @@ end
 
 function CameraAttributeHandlers.camera_av_stream_management_attribute_list_handler(driver, device, ib, response)
   if not ib.data.elements then return end
-  local status_light_enabled_present, status_light_brightness_present = false, false
+  local status_light_enabled_present, status_light_brightness_present, hard_privacy_mode_present = false, false, false
   local attribute_ids = {}
   for _, attr in ipairs(ib.data.elements) do
     if attr.value == clusters.CameraAvStreamManagement.attributes.StatusLightEnabled.ID then
@@ -459,6 +471,8 @@ function CameraAttributeHandlers.camera_av_stream_management_attribute_list_hand
     elseif attr.value == clusters.CameraAvStreamManagement.attributes.StatusLightBrightness.ID then
       status_light_brightness_present = true
       table.insert(attribute_ids, clusters.CameraAvStreamManagement.attributes.StatusLightBrightness.ID)
+    elseif attr.value == clusters.CameraAvStreamManagement.attributes.HardPrivacyModeOn.ID then
+      hard_privacy_mode_present = true
     end
   end
   local component_map = device:get_field(fields.COMPONENT_TO_ENDPOINT_MAP) or {}
@@ -469,6 +483,7 @@ function CameraAttributeHandlers.camera_av_stream_management_attribute_list_hand
   }
   device:set_field(fields.COMPONENT_TO_ENDPOINT_MAP, component_map, {persist=true})
   camera_cfg.update_status_light_attribute_presence(device, status_light_enabled_present, status_light_brightness_present)
+  camera_cfg.update_hard_privacy_mode_attribute_presence(device, hard_privacy_mode_present)
   camera_cfg.reconcile_profile_and_capabilities(device)
 end
 
diff --git a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/capability_handlers.lua b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/capability_handlers.lua
index 738d6d3556..ebf0411f99 100644
--- a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/capability_handlers.lua
+++ b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/capability_handlers.lua
@@ -59,8 +59,8 @@ end
 
 function CameraCapabilityHandlers.handle_set_volume(driver, device, cmd)
   local endpoint_id = device:component_to_endpoint(cmd.component)
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MAX
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MIN
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MAX
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MIN
   -- Convert from [0, 100] to [min_volume, max_volume] before writing attribute
   local volume_range = max_volume - min_volume
   local volume = utils.round(cmd.args.volume * volume_range / 100.0 + min_volume)
@@ -75,8 +75,8 @@ end
 
 function CameraCapabilityHandlers.handle_volume_up(driver, device, cmd)
   local endpoint_id = device:component_to_endpoint(cmd.component)
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MAX
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MIN
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MAX
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MIN
   local volume = device:get_latest_state(cmd.component, capabilities.audioVolume.ID, capabilities.audioVolume.volume.NAME)
   if not volume or volume >= max_volume then return end
   -- Convert from [0, 100] to [min_volume, max_volume] before writing attribute
@@ -91,8 +91,8 @@ end
 
 function CameraCapabilityHandlers.handle_volume_down(driver, device, cmd)
   local endpoint_id = device:component_to_endpoint(cmd.component)
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MAX
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MIN
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MAX
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MIN
   local volume = device:get_latest_state(cmd.component, capabilities.audioVolume.ID, capabilities.audioVolume.volume.NAME)
   if not volume or volume <= min_volume then return end
   -- Convert from [0, 100] to [min_volume, max_volume] before writing attribute
@@ -157,9 +157,15 @@ CameraCapabilityHandlers.ptz_set_position_factory = function(command)
     -- a single-axis command should only set (and clamp) the axis it targets.
     local pan, tilt, zoom
     if command == capabilities.mechanicalPanTiltZoom.commands.setPanTiltZoom then
-      pan = utils.clamp_value(cmd.args.pan, ptz_map[camera_fields.PAN_IDX].range.minimum, ptz_map[camera_fields.PAN_IDX].range.maximum)
-      tilt = utils.clamp_value(cmd.args.tilt, ptz_map[camera_fields.TILT_IDX].range.minimum, ptz_map[camera_fields.TILT_IDX].range.maximum)
-      zoom = utils.clamp_value(cmd.args.zoom, ptz_map[camera_fields.ZOOM_IDX].range.minimum, ptz_map[camera_fields.ZOOM_IDX].range.maximum)
+      if cmd.args.pan ~= nil then
+        pan = utils.clamp_value(cmd.args.pan, ptz_map[camera_fields.PAN_IDX].range.minimum, ptz_map[camera_fields.PAN_IDX].range.maximum)
+      end
+      if cmd.args.tilt ~= nil then
+        tilt = utils.clamp_value(cmd.args.tilt, ptz_map[camera_fields.TILT_IDX].range.minimum, ptz_map[camera_fields.TILT_IDX].range.maximum)
+      end
+      if cmd.args.zoom ~= nil then
+        zoom = utils.clamp_value(cmd.args.zoom, ptz_map[camera_fields.ZOOM_IDX].range.minimum, ptz_map[camera_fields.ZOOM_IDX].range.maximum)
+      end
     elseif command == capabilities.mechanicalPanTiltZoom.commands.setPan then
       pan = utils.clamp_value(cmd.args.pan, ptz_map[camera_fields.PAN_IDX].range.minimum, ptz_map[camera_fields.PAN_IDX].range.maximum)
     elseif command == capabilities.mechanicalPanTiltZoom.commands.setTilt then
diff --git a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/device_configuration.lua b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/device_configuration.lua
index 7cb8edd930..8a5db7c5b5 100644
--- a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/device_configuration.lua
+++ b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/device_configuration.lua
@@ -33,6 +33,27 @@ local function set_status_light_presence(device, status_light_enabled_present, s
   device:set_field(camera_fields.STATUS_LIGHT_BRIGHTNESS_PRESENT, status_light_brightness_present == true, { persist = true })
 end
 
+local function get_hard_privacy_mode_presence(device)
+  return device:get_field(camera_fields.HARD_PRIVACY_MODE_PRESENT)
+end
+
+local function set_hard_privacy_mode_presence(device, hard_privacy_mode_present)
+  device:set_field(camera_fields.HARD_PRIVACY_MODE_PRESENT, hard_privacy_mode_present == true, { persist = true })
+end
+
+--- Leaves audioVolume as-is if the min/max levels aren't both known yet instead of guessing;
+--- otherwise requires max > min to include it.
+--- @param component string a profile component name
+--- @return should_include boolean whether audioVolume belongs on the component argument.
+local function should_include_volume_capability(device, component)
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, component)
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, component)
+  if min_volume == nil or max_volume == nil then
+    return device:supports_capability(capabilities.audioVolume, component)
+  end
+  return max_volume > min_volume
+end
+
 local function build_webrtc_supported_features()
   return {
     bundle = true,
@@ -100,12 +121,32 @@ local function build_video_stream_settings_supported_features(device)
   return supported_features
 end
 
-local function build_camera_privacy_supported_attributes()
-  return { "softRecordingPrivacyMode", "softLivestreamPrivacyMode" }
+local function camera_privacy_feature_supported(device)
+  return camera_utils.feature_supported(device, clusters.CameraAvStreamManagement.ID, clusters.CameraAvStreamManagement.types.Feature.PRIVACY)
 end
 
-local function build_camera_privacy_supported_commands()
-  return { "setSoftRecordingPrivacyMode", "setSoftLivestreamPrivacyMode" }
+-- SoftRecordingPrivacyModeEnabled/SoftLivestreamPrivacyModeEnabled are conditionally mandatory on the PRIV
+-- feature, while HardPrivacyModeOn has independent optional conformance.
+-- A device can support either, both, or neither, so each is built independently.
+local function build_camera_privacy_supported_attributes(device)
+  local supported_attributes = {}
+  if camera_privacy_feature_supported(device) then
+    table.insert(supported_attributes, "softRecordingPrivacyMode")
+    table.insert(supported_attributes, "softLivestreamPrivacyMode")
+  end
+  if get_hard_privacy_mode_presence(device) then
+    table.insert(supported_attributes, "hardPrivacyMode")
+  end
+  return supported_attributes
+end
+
+local function build_camera_privacy_supported_commands(device)
+  local supported_commands = {}
+  if camera_privacy_feature_supported(device) then
+    table.insert(supported_commands, "setSoftRecordingPrivacyMode")
+    table.insert(supported_commands, "setSoftLivestreamPrivacyMode")
+  end
+  return supported_commands
 end
 
 local function capabilities_needing_reinit(device)
@@ -155,8 +196,8 @@ local function capabilities_needing_reinit(device)
     capabilities_to_reinit.video_stream_settings = true
   end
 
-  if should_init(capabilities.cameraPrivacyMode, capabilities.cameraPrivacyMode.supportedAttributes, build_camera_privacy_supported_attributes()) or
-    should_init(capabilities.cameraPrivacyMode, capabilities.cameraPrivacyMode.supportedCommands, build_camera_privacy_supported_commands()) then
+  if should_init(capabilities.cameraPrivacyMode, capabilities.cameraPrivacyMode.supportedAttributes, build_camera_privacy_supported_attributes(device)) or
+    should_init(capabilities.cameraPrivacyMode, capabilities.cameraPrivacyMode.supportedCommands, build_camera_privacy_supported_commands(device)) then
     capabilities_to_reinit.camera_privacy_mode = true
   end
 
@@ -194,6 +235,7 @@ end
 
 function CameraDeviceConfiguration.match_profile(device)
   local status_light_enabled_present, status_light_brightness_present = get_status_light_presence(device)
+  local hard_privacy_mode_present = get_hard_privacy_mode_presence(device)
   local profile_update_requested = false
   local optional_supported_component_capabilities = {}
   local main_component_capabilities = {}
@@ -229,17 +271,21 @@ function CameraDeviceConfiguration.match_profile(device)
             table.insert(main_component_capabilities, capabilities.audioRecording.ID)
           end
           table.insert(microphone_component_capabilities, capabilities.audioMute.ID)
-          table.insert(microphone_component_capabilities, capabilities.audioVolume.ID)
+          if should_include_volume_capability(device, camera_fields.profile_components.microphone) then
+            table.insert(microphone_component_capabilities, capabilities.audioVolume.ID)
+          end
         end
         if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.SNAPSHOT) then
           table.insert(main_component_capabilities, capabilities.imageCapture.ID)
         end
-        if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.PRIVACY) then
+        if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.PRIVACY) or hard_privacy_mode_present then
           table.insert(main_component_capabilities, capabilities.cameraPrivacyMode.ID)
         end
         if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.SPEAKER) then
           table.insert(speaker_component_capabilities, capabilities.audioMute.ID)
-          table.insert(speaker_component_capabilities, capabilities.audioVolume.ID)
+          if should_include_volume_capability(device, camera_fields.profile_components.speaker) then
+            table.insert(speaker_component_capabilities, capabilities.audioVolume.ID)
+          end
         end
         if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.IMAGE_CONTROL) then
           table.insert(main_component_capabilities, capabilities.imageControl.ID)
@@ -361,8 +407,8 @@ end
 local function init_camera_privacy_mode(device)
   if device:supports_capability(capabilities.cameraPrivacyMode) then
     local av_stream_management_ep_ids = device:get_endpoints(clusters.CameraAvStreamManagement.ID)
-    device:emit_event_for_endpoint(av_stream_management_ep_ids[1], capabilities.cameraPrivacyMode.supportedAttributes(build_camera_privacy_supported_attributes()))
-    device:emit_event_for_endpoint(av_stream_management_ep_ids[1], capabilities.cameraPrivacyMode.supportedCommands(build_camera_privacy_supported_commands()))
+    device:emit_event_for_endpoint(av_stream_management_ep_ids[1], capabilities.cameraPrivacyMode.supportedAttributes(build_camera_privacy_supported_attributes(device)))
+    device:emit_event_for_endpoint(av_stream_management_ep_ids[1], capabilities.cameraPrivacyMode.supportedCommands(build_camera_privacy_supported_commands(device)))
   end
 end
 
@@ -442,6 +488,10 @@ function CameraDeviceConfiguration.update_status_light_attribute_presence(device
   set_status_light_presence(device, status_light_enabled_present, status_light_brightness_present)
 end
 
+function CameraDeviceConfiguration.update_hard_privacy_mode_attribute_presence(device, hard_privacy_mode_present)
+  set_hard_privacy_mode_presence(device, hard_privacy_mode_present)
+end
+
 function CameraDeviceConfiguration.reinitialize_changed_camera_capabilities_and_subscriptions(device, old_profile, new_profile)
   local changed_capabilities = changed_capabilities_from_profiles(old_profile, new_profile)
   initialize_selected_camera_capabilities(device, changed_capabilities)
diff --git a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/fields.lua b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/fields.lua
index c88f177707..edb4deb125 100644
--- a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/fields.lua
+++ b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/fields.lua
@@ -16,6 +16,7 @@ CameraFields.TRIGGERED_ZONES = "__triggered_zones"
 CameraFields.DPTZ_VIEWPORTS = "__dptz_viewports"
 CameraFields.STATUS_LIGHT_ENABLED_PRESENT = "__status_light_enabled_present"
 CameraFields.STATUS_LIGHT_BRIGHTNESS_PRESENT = "__status_light_brightness_present"
+CameraFields.HARD_PRIVACY_MODE_PRESENT = "__hard_privacy_mode_present"
 
 CameraFields.CameraAVSMFeatureMapAttr = { ID = 0xFFFC, cluster = clusters.CameraAvStreamManagement.ID }
 CameraFields.CameraAVSULMFeatureMapAttr = { ID = 0xFFFC, cluster = clusters.CameraAvSettingsUserLevelManagement.ID }
diff --git a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/utils.lua b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/utils.lua
index 78792b94b3..5cc7dee498 100644
--- a/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/utils.lua
+++ b/drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/utils.lua
@@ -82,6 +82,14 @@ function CameraUtils.feature_supported(device, cluster_id, feature_flag)
   return #device:get_endpoints(cluster_id, { feature_bitmap = feature_flag }) > 0
 end
 
+function CameraUtils.get_field_for_component(device, field, component)
+  return device:get_field(string.format("%s_%s", field, component))
+end
+
+function CameraUtils.set_field_for_component(device, field, component, value, additional_params)
+  device:set_field(string.format("%s_%s", field, component), value, additional_params)
+end
+
 function CameraUtils.update_supported_attributes(device, ib, capability, attribute)
   local attribute_set = device:get_latest_state(
     camera_fields.profile_components.main, capability.ID, capability.supportedAttributes.NAME
@@ -212,18 +220,22 @@ function CameraUtils.subscribe(device)
       clusters.CameraAvSettingsUserLevelManagement.attributes.TiltMax,
       clusters.CameraAvSettingsUserLevelManagement.attributes.TiltMin
     },
+    -- SpeakerMaxLevel/MinLevel and MicrophoneMaxLevel/MinLevel are subscribed alongside audioMute
+    -- (unconditional on the AUDIO/SPEAKER feature) rather than audioVolume, since audioVolume's own
+    -- presence in the profile depends on first discovering these values -- gating their subscription
+    -- on audioVolume already being present would make that discovery impossible.
     [capabilities.audioMute.ID] = {
       clusters.CameraAvStreamManagement.attributes.SpeakerMuted,
-      clusters.CameraAvStreamManagement.attributes.MicrophoneMuted
-    },
-    [capabilities.audioVolume.ID] = {
-      clusters.CameraAvStreamManagement.attributes.SpeakerVolumeLevel,
+      clusters.CameraAvStreamManagement.attributes.MicrophoneMuted,
       clusters.CameraAvStreamManagement.attributes.SpeakerMaxLevel,
       clusters.CameraAvStreamManagement.attributes.SpeakerMinLevel,
-      clusters.CameraAvStreamManagement.attributes.MicrophoneVolumeLevel,
       clusters.CameraAvStreamManagement.attributes.MicrophoneMaxLevel,
       clusters.CameraAvStreamManagement.attributes.MicrophoneMinLevel
     },
+    [capabilities.audioVolume.ID] = {
+      clusters.CameraAvStreamManagement.attributes.SpeakerVolumeLevel,
+      clusters.CameraAvStreamManagement.attributes.MicrophoneVolumeLevel
+    },
     [capabilities.mode.ID] = {
       clusters.CameraAvStreamManagement.attributes.StatusLightBrightness
     },
diff --git a/drivers/SmartThings/matter-switch/src/sub_drivers/eve_energy/can_handle.lua b/drivers/SmartThings/matter-switch/src/sub_drivers/eve_energy/can_handle.lua
index 02bc9e06d2..2bc395ae43 100644
--- a/drivers/SmartThings/matter-switch/src/sub_drivers/eve_energy/can_handle.lua
+++ b/drivers/SmartThings/matter-switch/src/sub_drivers/eve_energy/can_handle.lua
@@ -10,9 +10,14 @@ return function(opts, driver, device)
   -- this sub driver loads for devices that:
   -- 1. Contain the Eve Private Cluster (0x130AFC01)
   -- 2. Do NOT have the Standard Electrical Sensor device type
+  -- 3. Match one of the known Eve Energy vendor/product ID combinations
+  -- We should still check that the device does not have the Electrical Sensor
+  -- device type because this sub driver is only needed for cases where devices
+  -- may be on old FW and do not support the standard Electical Sensor related clusters.
   if device.network_type == device_lib.NETWORK_TYPE_MATTER and
     #device:get_endpoints(EVE_PRIVATE_CLUSTER_ID) > 0 and
-    #switch_utils.get_endpoints_by_device_type(device, fields.DEVICE_TYPE_ID.ELECTRICAL_SENSOR) == 0 then
+    #switch_utils.get_endpoints_by_device_type(device, fields.DEVICE_TYPE_ID.ELECTRICAL_SENSOR) == 0 and
+    switch_utils.get_product_override_field(device, "needs_eve_energy_subdriver") then
     return true, require("sub_drivers.eve_energy")
   end
   return false
diff --git a/drivers/SmartThings/matter-switch/src/sub_drivers/hager/init.lua b/drivers/SmartThings/matter-switch/src/sub_drivers/hager/init.lua
index db8cfe67d4..8df254bde8 100644
--- a/drivers/SmartThings/matter-switch/src/sub_drivers/hager/init.lua
+++ b/drivers/SmartThings/matter-switch/src/sub_drivers/hager/init.lua
@@ -189,10 +189,10 @@ local function info_changed(driver, device, event, args)
   end
 
   if device.profile.id ~= args.old_st_store.profile.id or device.network_type == device_lib.NETWORK_TYPE_CHILD then
-    local parent = device:get_parent_device()
-    local matter_device = get_matter_device(parent)
-    local map = {}
-    device.thread:call_with_delay(2, function()
+    device.thread:call_with_delay(3, function()
+      local parent = device:get_parent_device()
+      local matter_device = get_matter_device(parent)
+      local map = {}
       if device:supports_capability(capabilities.button) then
         local button_eps = parent:get_field(BUTTON_EPS)
         local clean_eps = {}
diff --git a/drivers/SmartThings/matter-switch/src/switch_handlers/attribute_handlers.lua b/drivers/SmartThings/matter-switch/src/switch_handlers/attribute_handlers.lua
index ae1f219606..46338233a0 100644
--- a/drivers/SmartThings/matter-switch/src/switch_handlers/attribute_handlers.lua
+++ b/drivers/SmartThings/matter-switch/src/switch_handlers/attribute_handlers.lua
@@ -325,12 +325,12 @@ end
 --- SET feature, all AvailableEndpoints responses must be handled before profiling.
 function AttributeHandlers.available_endpoints_handler(driver, device, ib, response)
   if device:get_field(fields.profiling_data.POWER_TOPOLOGY) ~= nil then
-    device.log.warn("Received an AvailableEndpoints response after power topology has already been determined. Ignoring this response.")
+    device.log.warn_with({hub_logs=true},"Received an AvailableEndpoints response after power topology has already been determined. Ignoring this response.")
     return
   end
   local set_topology_eps = device:get_field(fields.ELECTRICAL_SENSOR_EPS)
   if set_topology_eps == nil then
-    device.log.warn("Received an AvailableEndpoints response but no Electrical Sensor endpoints have been identified as supporting the Power Topology cluster with SET feature. Ignoring this response.")
+    device.log.warn_with({hub_logs=true},"Received an AvailableEndpoints response but no Electrical Sensor endpoints have been identified as supporting the Power Topology cluster with SET feature. Ignoring this response.")
     return
   end
 
@@ -349,7 +349,8 @@ function AttributeHandlers.available_endpoints_handler(driver, device, ib, respo
       break
     end
   end
-  if #set_topology_eps == 0 then -- in other words, all AvailableEndpoints attribute responses have been handled
+  if switch_utils.is_field_empty(device, fields.ELECTRICAL_SENSOR_EPS) then
+    device.log.info_with({hub_logs=true}, "All AvailableEndpoints attribute responses for SET Electrical Sensor endpoints have been handled, attempting to match profile")
     device:set_field(fields.profiling_data.POWER_TOPOLOGY, clusters.PowerTopology.types.Feature.SET_TOPOLOGY, {persist=true})
     device_cfg.match_profile(driver, device)
   end
@@ -360,16 +361,16 @@ end
 
 function AttributeHandlers.parts_list_handler(driver, device, ib, response)
   if device:get_field(fields.profiling_data.POWER_TOPOLOGY) ~= nil then
-    device.log.warn("Received a PartsList response after power topology has already been determined. Ignoring this response.")
+    device.log.warn_with({hub_logs=true}, "Received a PartsList response after power topology has already been determined. Ignoring this response.")
     return
   end
   local tree_topology_eps = device:get_field(fields.ELECTRICAL_SENSOR_EPS)
   if tree_topology_eps == nil then
-    device.log.warn("Received a PartsList response but no Electrical Sensor endpoints have been identified as supporting the Power Topology cluster with TREE feature. Ignoring this response.")
+    device.log.warn_with({hub_logs=true}, "Received a PartsList response but no Electrical Sensor endpoints have been identified as supporting the Power Topology cluster with TREE feature. Ignoring this response.")
     return
   end
 
-  device.log.debug_with({hub_logs=true}, string.format("Handling PartsList response for endpoint %d with elements: %s", ib.endpoint_id, st_utils.stringify_table(ib.data.elements or {})))
+  device.log.info_with({hub_logs=true}, string.format("Handling PartsList response for endpoint %d with elements: %s", ib.endpoint_id, st_utils.stringify_table(ib.data.elements or {})))
   for i, tree_ep_info in pairs(tree_topology_eps or {}) do
     if ib.endpoint_id == tree_ep_info.endpoint_id then
       -- since EP response is being handled here, remove it from the ELECTRICAL_SENSOR_EPS table
@@ -384,7 +385,8 @@ function AttributeHandlers.parts_list_handler(driver, device, ib, response)
       break
     end
   end
-  if #tree_topology_eps == 0 then -- in other words, all PartsList attribute responses for TREE Electrical Sensor EPs have been handled
+  if switch_utils.is_field_empty(device, fields.ELECTRICAL_SENSOR_EPS) then
+    device.log.info_with({hub_logs=true}, "All PartsList attribute responses for TREE Electrical Sensor endpoints have been handled, attempting to match profile")
     device:set_field(fields.profiling_data.POWER_TOPOLOGY, clusters.PowerTopology.types.Feature.TREE_TOPOLOGY, {persist=true})
     device_cfg.match_profile(driver, device)
   end
diff --git a/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua b/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua
index 5873cb40b2..d16214d2fd 100644
--- a/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua
+++ b/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua
@@ -126,6 +126,15 @@ SwitchFields.vendor_overrides = {
     [0x0007] = { needs_hager_subdriver = true }, -- Hager HBnet PIR 1.1M
     [0x000A] = { needs_hager_subdriver = true }, -- Hager HBnet PIR 2.2M
   },
+  [0x130A] = { -- EVE_MANUFACTURER_ID
+    [0x0050] = { needs_eve_energy_subdriver = true }, -- Eve Energy EU
+    [0x0053] = { needs_eve_energy_subdriver = true }, -- Eve Energy US
+    [0x0054] = { needs_eve_energy_subdriver = true }, -- Eve Energy UK
+    [0x005E] = { needs_eve_energy_subdriver = true }, -- Eve Energy AU
+    [0x0069] = { needs_eve_energy_subdriver = true }, -- Eve Energy Outlet US
+    [0x006A] = { needs_eve_energy_subdriver = true }, -- Eve Energy CH
+    [0x006B] = { needs_eve_energy_subdriver = true }, -- Eve Energy Outlet EU
+  },
   [0x1321] = { -- SONOFF_MANUFACTURER_ID
     [0x000C] = { target_profile = "switch-binary", initial_profile = "plug-binary" },
     [0x000D] = { target_profile = "switch-binary", initial_profile = "plug-binary" },
diff --git a/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua b/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua
index 1d12f41781..cb95ff770b 100644
--- a/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua
+++ b/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua
@@ -53,11 +53,20 @@ end
 function utils.remove_field_index(device, field_name, index)
   local new_table = device:get_field(field_name)
   if type(new_table) == "table" then
-    new_table[index] = nil -- remove value associated with index from table
+    new_table[index] = nil -- remove value associated with index from table without altering table structure
     device:set_field(field_name, new_table)
   end
 end
 
+function utils.is_field_empty(device, field_name)
+  local field = device:get_field(field_name)
+  if type(field) == "table" then
+    return next(field) == nil
+  else
+    return field == nil
+  end
+end
+
 function utils.mired_to_kelvin(value, minOrMax)
   if value == 0 then -- shouldn't happen, but has
     value = 1
diff --git a/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_set.lua b/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_set.lua
index 32989187fa..18074c9b4e 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_set.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_set.lua
@@ -112,6 +112,59 @@ local mock_device_periodic = test.mock_device.build_test_matter_device({
   },
 })
 
+--- Models an outlet of a multi-outlet power strip, which combines the Electrical Sensor and
+--- OnOff Plug In Unit device types on a single endpoint. Note that the Electrical Sensor device
+--- type is listed first, so it is the endpoint's primary device type and no profile is mapped to it.
+local function build_power_strip_outlet_endpoint(endpoint_id)
+  return {
+    endpoint_id = endpoint_id,
+    clusters = {
+      { cluster_id = clusters.OnOff.ID, cluster_type = "SERVER", cluster_revision = 1, feature_map = 1, },
+      { cluster_id = clusters.ElectricalPowerMeasurement.ID, cluster_type = "SERVER", feature_map = 2, },
+      { cluster_id = clusters.ElectricalEnergyMeasurement.ID, cluster_type = "SERVER", feature_map = 15, },
+      { cluster_id = clusters.PowerTopology.ID, cluster_type = "SERVER", feature_map = 4, }, -- SET_TOPOLOGY
+    },
+    device_types = {
+      { device_type_id = 0x0510, device_type_revision = 1 }, -- Electrical Sensor
+      { device_type_id = 0x010A, device_type_revision = 1 }, -- OnOff Plug In Unit
+    }
+  }
+end
+
+--- A 4-outlet power strip that reports its endpoints out of numerical order, as the Tapo
+--- P304M does. The order in which the AvailableEndpoints reports are handled must not affect
+--- profiling: every Electrical Sensor endpoint has to be accounted for before profiles are matched.
+local mock_device_power_strip = test.mock_device.build_test_matter_device({
+  profile = t_utils.get_profile_definition("plug-power-energy-powerConsumption.yml"),
+  manufacturer_info = {
+    vendor_id = 0x1392,
+    product_id = 0x010F,
+  },
+  endpoints = {
+    {
+      endpoint_id = 0,
+      clusters = {
+        { cluster_id = clusters.Basic.ID, cluster_type = "SERVER" },
+      },
+      device_types = {
+        { device_type_id = 0x0016, device_type_revision = 1 } -- RootNode
+      }
+    },
+    build_power_strip_outlet_endpoint(1),
+    build_power_strip_outlet_endpoint(3),
+    build_power_strip_outlet_endpoint(4),
+    build_power_strip_outlet_endpoint(2),
+  },
+})
+
+local subscribed_attributes_power_strip = {
+  clusters.OnOff.attributes.OnOff,
+  clusters.ElectricalPowerMeasurement.attributes.ActivePower,
+  clusters.ElectricalEnergyMeasurement.attributes.CumulativeEnergyImported,
+  clusters.ElectricalEnergyMeasurement.attributes.PeriodicEnergyImported,
+  clusters.PowerTopology.attributes.AvailableEndpoints,
+}
+
 local subscribed_attributes_periodic = {
   clusters.OnOff.attributes.OnOff,
   clusters.ElectricalEnergyMeasurement.attributes.CumulativeEnergyImported,
@@ -201,6 +254,17 @@ local function test_init_periodic()
   test.socket.matter:__expect_send({ mock_device_periodic.id, subscribe_request })
 end
 
+local function test_init_power_strip()
+  test.mock_device.add_test_device(mock_device_power_strip)
+  local subscribe_request = subscribed_attributes_power_strip[1]:subscribe(mock_device_power_strip)
+  for i, cluster in ipairs(subscribed_attributes_power_strip) do
+    if i > 1 then
+      subscribe_request:merge(cluster:subscribe(mock_device_power_strip))
+    end
+  end
+  test.socket.matter:__expect_send({ mock_device_power_strip.id, subscribe_request })
+end
+
 test.register_message_test(
   "Active power measurement should generate correct messages",
   {
@@ -711,4 +775,39 @@ test.register_message_test(
   }
 )
 
+test.register_coroutine_test(
+  "Profiling of a power strip must wait for the AvailableEndpoints report of every Electrical Sensor endpoint",
+  function()
+    test.socket.device_lifecycle:__queue_receive({ mock_device_power_strip.id, "doConfigure" })
+    mock_device_power_strip:expect_metadata_update({ provisioning_state = "PROVISIONED" })
+    test.wait_for_events()
+    -- the reports arrive in endpoint order, which does not match the order that the endpoints
+    -- were reported in during the interview. Each outlet is the only endpoint in its own power set.
+    for _, endpoint_id in ipairs({1, 2, 3, 4}) do
+      test.socket.matter:__queue_receive({
+        mock_device_power_strip.id,
+        clusters.PowerTopology.attributes.AvailableEndpoints:build_test_report_data(
+          mock_device_power_strip, endpoint_id, {uint32(endpoint_id)}
+        )
+      })
+    end
+    -- every outlet supports both power and energy measurement, so none of them should fall back
+    -- to the generic "switch-binary" profile used for an OnOff endpoint without electrical tags
+    for _, endpoint_id in ipairs({2, 3, 4}) do
+      mock_device_power_strip:expect_device_create({
+        type = "EDGE_CHILD",
+        label = string.format("nil %d", endpoint_id),
+        profile = "plug-power-energy-powerConsumption",
+        parent_device_id = mock_device_power_strip.id,
+        parent_assigned_child_key = string.format("%d", endpoint_id)
+      })
+    end
+    mock_device_power_strip:expect_metadata_update({ profile = "plug-power-energy-powerConsumption" })
+  end,
+  {
+    test_init = test_init_power_strip,
+    min_api_version = 14
+  }
+)
+
 test.run_registered_tests()
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 4aeee85023..666550dfcf 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua
@@ -17,6 +17,7 @@ end
 local MATTER_DEVICE_ID = "MATTER_DEVICE_ID"
 local PARENT_ID = "PARENT_ID"
 local BUTTON_EPS = "__button_eps"
+local MAIN_WC_EP = "__main_wc_ep"
 
 local function create_parent_device(product_id)
   return test.mock_device.build_test_matter_device({
@@ -434,6 +435,80 @@ local function create_hager_pir_device(profile_name, parent)
   })
 end
 
+-- Create Hager 1G device with ONLY a WindowCovering endpoint (12) - no button or occupancy endpoints
+local function create_hager_1g_window_covering(profile_name, parent)
+  return test.mock_device.build_test_matter_device({
+    label = "Hager G2 1G Window Covering",
+    profile = t_utils.get_profile_definition(profile_name .. ".yml"),
+    type = "MATTER",
+    manufacturer_info = {
+      vendor_id = 0x1285,
+      product_id = 0x0005,
+    },
+    parent_device_id = parent.id,
+    endpoints = {
+      {
+        endpoint_id = 0,
+        clusters = { { cluster_id = clusters.Basic.ID, cluster_type = "SERVER" } },
+        device_types = { { device_type_id = 0x0016, device_type_revision = 1 } }
+      },
+      {
+        endpoint_id = 12,
+        clusters = {
+          {
+            cluster_id = clusters.WindowCovering.ID,
+            cluster_type = "SERVER",
+            cluster_revision = 1,
+            feature_map = clusters.WindowCovering.types.Feature.LIFT |
+              clusters.WindowCovering.types.Feature.POSITION_AWARE_LIFT |
+              clusters.WindowCovering.types.Feature.ABSOLUTE_POSITION,
+            attributes = {
+              [clusters.WindowCovering.attributes.OperationalStatus.ID] = 0x00,
+              [clusters.WindowCovering.attributes.CurrentPositionLiftPercent100ths.ID] = 0x0000,
+            }
+          }
+        },
+        device_types = { { device_type_id = 0x0202, device_type_revision = 1 } }
+      },
+    }
+  })
+end
+
+-- Create Hager 1G Relay device with endpoint 3 (OnOff cluster)
+local function create_hager_1g_relay(profile_name, parent)
+  return test.mock_device.build_test_matter_device({
+    label = "Hager G2 1G Relay",
+    profile = t_utils.get_profile_definition(profile_name .. ".yml"),
+    type = "MATTER",
+    manufacturer_info = {
+      vendor_id = 0x1285,
+      product_id = 0x0005,
+    },
+    parent_device_id = parent.id,
+    endpoints = {
+      {
+        endpoint_id = 0,
+        clusters = { { cluster_id = clusters.Basic.ID, cluster_type = "SERVER" } },
+        device_types = { { device_type_id = 0x0016, device_type_revision = 1 } }
+      },
+      {
+        endpoint_id = 3,
+        clusters = {
+          {
+            cluster_id = clusters.OnOff.ID,
+            cluster_type = "SERVER",
+            cluster_revision = 1,
+            attributes = {
+              [clusters.OnOff.attributes.OnOff.ID] = false
+            }
+          }
+        },
+        device_types = { { device_type_id = 0x0100, device_type_revision = 1 } }
+      },
+    }
+  })
+end
+
 local function add_parent_device(parent)
   test.mock_device.add_test_device(parent)
   test.socket.device_lifecycle:__queue_receive({ parent.id, "added" })
@@ -496,8 +571,8 @@ end
 
 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)
+  test.timer.__create_and_queue_test_time_advance_timer(3, "oneshot")
+  test.mock_time.advance_time(3)
   if parent ~= nil then
     test.socket.device_lifecycle:__queue_receive(parent:generate_info_changed({}))
   end
@@ -515,6 +590,50 @@ local function configure_parent(device)
   test.mock_time.advance_time(3)
 end
 
+-- Create window covering child device on EP12 via PartsList and DeviceTypeList reports
+local function announce_window_covering_child(host, matter_device)
+  test.socket.matter:__queue_receive({
+    host.id,
+    clusters.Descriptor.attributes.PartsList:build_test_report_data(host, 2, data_types.Array({
+      data_types.Uint16(8),
+      data_types.Uint16(9),
+      data_types.Uint16(12),
+    }))
+  })
+  for _, ep in ipairs({ 8, 9, 12 }) do
+    test.socket.matter:__expect_send({
+      host.id,
+      clusters.Descriptor.attributes.DeviceTypeList:subscribe(host, ep)
+    })
+  end
+
+  test.socket.matter:__queue_receive({
+    host.id,
+    clusters.Descriptor.attributes.DeviceTypeList:build_test_report_data(host, 12, data_types.Array {
+      {
+        device_type = data_types.Uint32(514),
+        revision = data_types.Uint16(1)
+      }
+    })
+  })
+  host:expect_device_create({
+    type = "EDGE_CHILD",
+    label = "Hager G2 4x Button 1",
+    profile = "window-covering",
+    parent_device_id = host.id,
+    parent_assigned_child_key = "12"
+  })
+
+  local child_wc = test.mock_device.build_test_child_device({
+    profile = t_utils.get_profile_definition("window-covering.yml"),
+    device_network_id = string.format("%s:12", host.id),
+    parent_device_id = host.id,
+    parent_assigned_child_key = "12"
+  })
+  test.mock_device.add_test_device(child_wc)
+  return child_wc
+end
+
 local parent = create_parent_device(0x0006)  -- 2G button product
 local parent_1g = create_parent_device(0x0005)  -- 1G button product
 local parent_pir = create_parent_device(0x0007)  -- PIR product
@@ -596,9 +715,9 @@ test.register_coroutine_test("Test: 4-Button Device Detection - Profile Changes
   })
 
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: Button Event Handling - Pushed, Double Press, and Held Events on 4-Button Device", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -803,9 +922,9 @@ test.register_coroutine_test("Test: Button Event Handling - Pushed, Double Press
   })
   test.socket.capability:__expect_send(matter_device:generate_test_message("button4", capabilities.button.button.held({ state_change = true })))
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: Device Type Handler - Handles Button (Type 15) and OnOff (Type 256) Device Types with Child Creation", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -899,9 +1018,9 @@ test.register_coroutine_test("Test: Device Type Handler - Handles Button (Type 1
     clusters.OnOff.attributes.OnOff:subscribe(parent, nil)
   })
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: 2G Relay - Profile Changes Between light-binary and 2-button Based On Endpoint Availability", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1144,9 +1263,9 @@ test.register_coroutine_test("Test: 2G Relay - Profile Changes Between light-bin
     parent_assigned_child_key = "4"
   })
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: Dimmer Device - Child Creation for Dimmable Endpoint with Button Support", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1243,9 +1362,9 @@ test.register_coroutine_test("Test: Dimmer Device - Child Creation for Dimmable
   })
 
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: 1G Dimmer - Initialization and Profile Update to light-level", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1255,9 +1374,9 @@ test.register_coroutine_test("Test: 1G Dimmer - Initialization and Profile Updat
   test.wait_for_events()
   configure_parent(parent)
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: 1G Dimmer - Host Commands and Level Control Capabilities", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1330,9 +1449,9 @@ test.register_coroutine_test("Test: 1G Dimmer - Host Commands and Level Control
     clusters.LevelControl.server.commands.MoveToLevelWithOnOff(dimmer, 4, 51, nil, 0, 0)
   })
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: PIR Device - Initialization with Motion and Illuminance Capabilities", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1343,9 +1462,9 @@ test.register_coroutine_test("Test: PIR Device - Initialization with Motion and
   configure_parent(parent_pir)
 
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: PIR Device - Complete Functionality with Motion, Illuminance, and Dimmer Support", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1417,6 +1536,7 @@ test.register_coroutine_test("Test: PIR Device - Complete Functionality with Mot
   })
   test.wait_for_events()
   initiate_info_changed(pir_device, "motion-illuminance")
+
   test.socket.matter:__expect_send({
     parent_pir.id,
     cluster_base.subscribe(parent_pir, nil, clusters.IlluminanceMeasurement.ID, clusters.IlluminanceMeasurement.attributes.MeasuredValue.ID, nil)
@@ -1433,8 +1553,8 @@ test.register_coroutine_test("Test: PIR Device - Complete Functionality with Mot
     parent_device_id = parent_pir.id,
     parent_assigned_child_key = "3"
   })
-
   test.mock_device.add_test_device(child_dimmer)
+
   initiate_info_changed(child_dimmer, "light-level", parent_pir)
   test.socket.matter:__expect_send({
     parent_pir.id,
@@ -1453,6 +1573,7 @@ test.register_coroutine_test("Test: PIR Device - Complete Functionality with Mot
     cluster_base.subscribe(parent_pir, nil, clusters.LevelControl.ID, clusters.LevelControl.attributes.MinLevel.ID, nil)
   })
   test.wait_for_events()
+
   --Verify motion detected event
   test.socket.matter:__queue_receive({
     parent_pir.id,
@@ -1476,13 +1597,14 @@ test.register_coroutine_test("Test: PIR Device - Complete Functionality with Mot
     parent_pir.id,
     clusters.OnOff.commands.On(parent_pir, 3)
   })
+
   -- Verify on state via attribute report
   test.socket.matter:__queue_receive({
     parent_pir.id,
     clusters.OnOff.attributes.OnOff:build_test_report_data(parent_pir, 3, true)
   })
-  test.socket.capability:__expect_send(child_dimmer:generate_test_message("main", capabilities.switch.switch.on()))
   parent_pir.expect_native_attr_handler_registration(parent_pir, "switch", "switch")
+  test.socket.capability:__expect_send(child_dimmer:generate_test_message("main", capabilities.switch.switch.on()))
 
   -- Set dimmer level to 50%
   test.socket.capability:__queue_receive({ child_dimmer.id, { capability = "switchLevel", component = "main", command = "setLevel", args = { 50 } } })
@@ -1500,9 +1622,9 @@ test.register_coroutine_test("Test: PIR Device - Complete Functionality with Mot
   test.socket.capability:__expect_send(child_dimmer:generate_test_message("main", capabilities.switchLevel.level(50)))
   parent_pir.expect_native_attr_handler_registration(parent_pir, "switchLevel", "level")
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: Host with Window Covering - 2-Button Profile with Window Covering Child Device", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1561,7 +1683,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", parent)
+  initiate_info_changed(child_wc, "window-covering",parent)
 
   test.socket.matter:__expect_send({
     parent.id,
@@ -1641,9 +1763,9 @@ test.register_coroutine_test("Test: Host with Window Covering - 2-Button Profile
   test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShade.windowShade.closed()))
 
 end,
-    {
-      min_api_version = 15
-    })
+  {
+    min_api_version = 15
+  })
 
 test.register_coroutine_test("Test: Window Covering - Preference Changes for Reverse Polarity and Preset Position", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1810,8 +1932,188 @@ test.register_coroutine_test("Test: Window Covering - Preference Changes for Rev
     cluster_base.subscribe(parent, nil, clusters.WindowCovering.ID, clusters.WindowCovering.attributes.CurrentPositionLiftPercent100ths.ID, nil)
   })
 end,
-    {
-      min_api_version = 15
+  {
+    min_api_version = 15
+  })
+
+test.register_coroutine_test("Test: 1G Window Covering - window-covering Profile and No Duplicate Child Device", function()
+  test.socket.matter:__set_channel_ordering("relaxed")
+  add_parent_device(parent_1g)
+  local wc_1g = create_hager_1g_window_covering("window-covering", parent_1g)
+  add_matter_device(wc_1g, parent_1g, "window-covering")
+  test.wait_for_events()
+  configure_parent(parent_1g)
+  test.wait_for_events()
+
+  local main_wc_ep = wc_1g:get_field(MAIN_WC_EP)
+  assert(main_wc_ep == 12, "MAIN_WC_EP is set to 12")
+
+  -- EP12 reported again → no second child created, MAIN_WC_EP already set
+  test.socket.matter:__queue_receive({
+    parent_1g.id,
+    clusters.Descriptor.attributes.PartsList:build_test_report_data(parent_1g, 2, data_types.Array({
+      data_types.Uint16(12),
+    }))
+  })
+  test.socket.matter:__expect_send({
+    parent_1g.id,
+    clusters.Descriptor.attributes.DeviceTypeList:subscribe(parent_1g, 12)
+  })
+  test.wait_for_events()
+
+  test.socket.matter:__queue_receive({
+    parent_1g.id,
+    clusters.Descriptor.attributes.DeviceTypeList:build_test_report_data(parent_1g, 12, data_types.Array {
+      {
+        device_type = data_types.Uint32(514),
+        revision = data_types.Uint16(1)
+      }
+    })
+  })
+  test.wait_for_events()
+end,
+  {
+    min_api_version = 15
+  })
+
+test.register_coroutine_test("Test: 1G Relay - Profile Changes Between light-binary and 2-button Based On EP3 Availability", function()
+  test.socket.matter:__set_channel_ordering("relaxed")
+  add_parent_device(parent_1g)
+  local relay_1g = create_hager_1g_relay("light-binary", parent_1g)
+  add_switch_matter_device(relay_1g, parent_1g)
+  test.wait_for_events()
+  configure_parent(parent_1g)
+  test.wait_for_events()
+
+  -- Scenario 1: EP3 present → light-binary profile
+  test.socket.matter:__queue_receive({
+    parent_1g.id,
+    clusters.Descriptor.attributes.PartsList:build_test_report_data(parent_1g, 2, data_types.Array({
+      data_types.Uint16(3),
+    }))
+  })
+  test.socket.matter:__expect_send({
+    parent_1g.id,
+    clusters.Descriptor.attributes.DeviceTypeList:subscribe(parent_1g, 3)
+  })
+  relay_1g:expect_metadata_update({ profile = "light-binary" })
+  test.wait_for_events()
+
+  -- EP3 is device type 256 (OnOff) - no child device created for 1G
+  test.socket.matter:__queue_receive({
+    parent_1g.id,
+    clusters.Descriptor.attributes.DeviceTypeList:build_test_report_data(parent_1g, 3, data_types.Array {
+      {
+        device_type = data_types.Uint32(256),
+        revision = data_types.Uint16(1)
+      }
     })
+  })
+  test.wait_for_events()
+
+  -- Scenario 2: EP3 removed, buttons 8 & 9 present → 2-button profile
+  test.socket.matter:__queue_receive({
+    parent_1g.id,
+    clusters.Descriptor.attributes.PartsList:build_test_report_data(parent_1g, 2, data_types.Array({
+      data_types.Uint16(8),
+      data_types.Uint16(9),
+    }))
+  })
+  test.socket.matter:__expect_send({
+    parent_1g.id,
+    clusters.Descriptor.attributes.DeviceTypeList:subscribe(parent_1g, 8)
+  })
+  test.socket.matter:__expect_send({
+    parent_1g.id,
+    clusters.Descriptor.attributes.DeviceTypeList:subscribe(parent_1g, 9)
+  })
+  relay_1g:expect_metadata_update({ profile = "2-button" })
+  test.wait_for_events()
+end,
+  {
+    min_api_version = 15
+  })
+
+test.register_coroutine_test("Test: Window Covering - Position Attribute Reports With Reverse Polarity", function()
+  test.socket.matter:__set_channel_ordering("relaxed")
+  add_parent_device(parent)
+  local window_covering_device = create_matter_device_with_window("2-button", parent)
+  add_matter_device(window_covering_device, parent, "2-button")
+  test.wait_for_events()
+  configure_parent(parent)
+  test.wait_for_events()
+
+  local child_wc = announce_window_covering_child(parent)
+  test.wait_for_events()
+
+  -- Attribute reports are addressed to the host, so reverse is set on the host
+  test.socket.device_lifecycle():__queue_receive(
+    parent:generate_info_changed({ preferences = { reverse = "true" } })
+  )
+  test.wait_for_events()
+
+  -- Verify 50% position via attribute report - direction independent
+  test.socket.matter:__queue_receive({
+    parent.id,
+    clusters.WindowCovering.attributes.CurrentPositionLiftPercent100ths:build_test_report_data(parent, 12, 5000)
+  })
+  test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShadeLevel.shadeLevel(50)))
+  test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShade.windowShade.partially_open()))
+  test.wait_for_events()
+
+  -- Verify 100% position via attribute report - with reverse true, this should report closed
+  test.socket.matter:__queue_receive({
+    parent.id,
+    clusters.WindowCovering.attributes.CurrentPositionLiftPercent100ths:build_test_report_data(parent, 12, 0)
+  })
+  test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShadeLevel.shadeLevel(100)))
+  test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShade.windowShade.closed()))
+  test.wait_for_events()
+
+  -- Verify 0% position via attribute report - with reverse true, this should report open
+  test.socket.matter:__queue_receive({
+    parent.id,
+    clusters.WindowCovering.attributes.CurrentPositionLiftPercent100ths:build_test_report_data(parent, 12, 10000)
+  })
+  test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShadeLevel.shadeLevel(0)))
+  test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShade.windowShade.open()))
+  test.wait_for_events()
+end,
+  {
+    min_api_version = 15
+  })
+
+test.register_coroutine_test("Test: Window Covering - Unrecognised OperationalStatus Reports Unknown State", function()
+  test.socket.matter:__set_channel_ordering("relaxed")
+  add_parent_device(parent)
+  local window_covering_device = create_matter_device_with_window("2-button", parent)
+  add_matter_device(window_covering_device, parent, "2-button")
+  test.wait_for_events()
+  configure_parent(parent)
+  test.wait_for_events()
+
+  local child_wc = announce_window_covering_child(parent)
+  initiate_info_changed(child_wc, "window-covering", parent)
+  test.socket.matter:__expect_send({
+    parent.id,
+    cluster_base.subscribe(parent, nil, clusters.WindowCovering.ID, clusters.WindowCovering.attributes.OperationalStatus.ID, nil)
+  })
+  test.socket.matter:__expect_send({
+    parent.id,
+    cluster_base.subscribe(parent, nil, clusters.WindowCovering.ID, clusters.WindowCovering.attributes.CurrentPositionLiftPercent100ths.ID, nil)
+  })
+  test.wait_for_events()
+
+  -- OperationalStatus 0x03 is neither opening (1) nor closing (2)
+  test.socket.matter:__queue_receive({
+    parent.id,
+    clusters.WindowCovering.attributes.OperationalStatus:build_test_report_data(parent, 12, 0x03)
+  })
+  test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShade.windowShade.unknown()))
+  test.wait_for_events()
+end,
+  {
+    min_api_version = 15
+  })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_camera.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_camera.lua
index 020b7bb906..6f5b1251eb 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_camera.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_camera.lua
@@ -420,6 +420,15 @@ local additional_subscribed_attributes = {
   clusters.Switch.server.events.MultiPressComplete
 }
 
+-- audioVolume is only added to the speaker/microphone components once a usable (max > min) volume
+-- range has been reported; seed a usable range directly so unrelated tests don't have to simulate it.
+local function seed_usable_volume_range(device)
+  device:set_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. camera_fields.profile_components.speaker, 0)
+  device:set_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. camera_fields.profile_components.speaker, 200)
+  device:set_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. camera_fields.profile_components.microphone, 0)
+  device:set_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. camera_fields.profile_components.microphone, 200)
+end
+
 local expected_metadata = {
   optional_component_capabilities = {
     {
@@ -473,6 +482,7 @@ local expected_metadata = {
 }
 
 local function update_device_profile()
+  seed_usable_volume_range(mock_device)
   test.socket.matter:__queue_receive({
     mock_device.id,
     clusters.CameraAvStreamManagement.attributes.AttributeList:build_test_report_data(mock_device, CAMERA_EP, {
@@ -712,6 +722,7 @@ end
 test.register_coroutine_test(
   "Software version change should trigger camera reprofiling when camera endpoint is present",
   function()
+    seed_usable_volume_range(mock_device)
     test.socket.device_lifecycle:__queue_receive(
       mock_device:generate_info_changed({ matter_version = { hardware = 1, software = 2 } })
     )
@@ -800,6 +811,7 @@ test.register_coroutine_test(
       subscribe = function() subscribe_called = true end,
       supports_capability = function() return false end,
       get_endpoints = function() return { DOORBELL_EP } end,
+      get_field = function() return nil end,
     }
 
     local original_match_profile = camera_cfg.match_profile
@@ -894,6 +906,9 @@ test.register_coroutine_test(
       get_endpoints = function()
         return { CAMERA_EP }
       end,
+      get_field = function()
+        return nil
+      end,
       emit_event_for_endpoint = function()
         init_event_count = init_event_count + 1
       end
@@ -909,6 +924,419 @@ test.register_coroutine_test(
   }
 )
 
+test.register_coroutine_test(
+  "Camera privacy mode should be added to profile when HardPrivacyModeOn is present even without the PRIV feature",
+  function()
+    local camera_cfg = require "sub_drivers.camera.camera_utils.device_configuration"
+
+    local updated_metadata = nil
+    local fake_device = {
+      profile = { components = {} },
+      endpoints = {
+        {
+          endpoint_id = CAMERA_EP,
+          device_types = {
+            {device_type_id = 0x0142, device_type_revision = 1} -- Camera
+          },
+          clusters = {
+            {
+              cluster_id = clusters.CameraAvStreamManagement.ID,
+              feature_map = clusters.CameraAvStreamManagement.types.Feature.VIDEO, -- no PRIVACY feature
+              cluster_type = "SERVER"
+            }
+          }
+        }
+      },
+      get_field = function(_, field)
+        return field == camera_fields.HARD_PRIVACY_MODE_PRESENT
+      end,
+      get_endpoints = function() return {} end,
+      try_update_metadata = function(_, metadata) updated_metadata = metadata end,
+    }
+
+    camera_cfg.match_profile(fake_device)
+
+    assert(updated_metadata ~= nil, "profile update should be requested when HardPrivacyModeOn is present")
+    local main_capabilities
+    for _, component in ipairs(updated_metadata.optional_component_capabilities) do
+      if component[1] == "main" then
+        main_capabilities = component[2]
+      end
+    end
+    local found = false
+    for _, cap_id in ipairs(main_capabilities or {}) do
+      if cap_id == capabilities.cameraPrivacyMode.ID then
+        found = true
+      end
+    end
+    assert(found, "cameraPrivacyMode should be added to the profile based on HardPrivacyModeOn presence alone")
+  end,
+  {
+    min_api_version = 14
+  }
+)
+
+local function build_fake_device_with_volume_ranges(raw_levels)
+  return {
+    profile = { components = {} },
+    endpoints = {
+      {
+        endpoint_id = CAMERA_EP,
+        device_types = {
+          {device_type_id = 0x0142, device_type_revision = 1} -- Camera
+        },
+        clusters = {
+          {
+            cluster_id = clusters.CameraAvStreamManagement.ID,
+            feature_map = clusters.CameraAvStreamManagement.types.Feature.AUDIO |
+              clusters.CameraAvStreamManagement.types.Feature.SPEAKER,
+            cluster_type = "SERVER"
+          }
+        }
+      }
+    },
+    get_field = function(_, field) return raw_levels[field] end,
+    get_endpoints = function() return {} end,
+    supports_capability = function() return false end,
+    try_update_metadata = function(self, metadata) self.updated_metadata = metadata end,
+  }
+end
+
+local function component_capabilities(updated_metadata, component_name)
+  for _, component in ipairs(updated_metadata.optional_component_capabilities) do
+    if component[1] == component_name then
+      return component[2]
+    end
+  end
+  return {}
+end
+
+local function list_contains(list, value)
+  for _, v in ipairs(list) do
+    if v == value then return true end
+  end
+  return false
+end
+
+test.register_coroutine_test(
+  "audioVolume should be excluded from speaker and microphone when the volume range is unusable or unknown",
+  function()
+    local camera_cfg = require "sub_drivers.camera.camera_utils.device_configuration"
+
+    -- microphone reports an unusable range (min >= max); speaker hasn't reported a range at all yet
+    local fake_device = build_fake_device_with_volume_ranges({
+      [camera_fields.MIN_VOLUME_LEVEL .. "_microphone"] = 100,
+      [camera_fields.MAX_VOLUME_LEVEL .. "_microphone"] = 100,
+    })
+
+    camera_cfg.match_profile(fake_device)
+
+    assert(fake_device.updated_metadata ~= nil, "profile update should be requested")
+    local speaker_capabilities = component_capabilities(fake_device.updated_metadata, "speaker")
+    local microphone_capabilities = component_capabilities(fake_device.updated_metadata, "microphone")
+
+    assert(list_contains(speaker_capabilities, capabilities.audioMute.ID), "audioMute should still be present on speaker")
+    assert(not list_contains(speaker_capabilities, capabilities.audioVolume.ID), "audioVolume should be excluded from speaker when its range is unknown")
+    assert(list_contains(microphone_capabilities, capabilities.audioMute.ID), "audioMute should still be present on microphone")
+    assert(not list_contains(microphone_capabilities, capabilities.audioVolume.ID), "audioVolume should be excluded from microphone when min >= max")
+  end,
+  {
+    min_api_version = 14
+  }
+)
+
+test.register_coroutine_test(
+  "audioVolume should be included on speaker and microphone when the volume range is usable",
+  function()
+    local camera_cfg = require "sub_drivers.camera.camera_utils.device_configuration"
+
+    local fake_device = build_fake_device_with_volume_ranges({
+      [camera_fields.MIN_VOLUME_LEVEL .. "_speaker"] = 0,
+      [camera_fields.MAX_VOLUME_LEVEL .. "_speaker"] = 200,
+      [camera_fields.MIN_VOLUME_LEVEL .. "_microphone"] = 0,
+      [camera_fields.MAX_VOLUME_LEVEL .. "_microphone"] = 200,
+    })
+
+    camera_cfg.match_profile(fake_device)
+
+    assert(fake_device.updated_metadata ~= nil, "profile update should be requested")
+    local speaker_capabilities = component_capabilities(fake_device.updated_metadata, "speaker")
+    local microphone_capabilities = component_capabilities(fake_device.updated_metadata, "microphone")
+
+    assert(list_contains(speaker_capabilities, capabilities.audioVolume.ID), "audioVolume should be included on speaker when max > min")
+    assert(list_contains(microphone_capabilities, capabilities.audioVolume.ID), "audioVolume should be included on microphone when max > min")
+  end,
+  {
+    min_api_version = 14
+  }
+)
+
+test.register_coroutine_test(
+  "audioVolume should be preserved on a component whose volume range isn't fully known yet",
+  function()
+    local camera_cfg = require "sub_drivers.camera.camera_utils.device_configuration"
+
+    -- Speaker already has audioVolume from a prior match; its raw min/max aren't in raw_levels (nil),
+    -- so it should be carried over as-is rather than being dropped for lack of information.
+    local existing_components = {
+      speaker = { capabilities = { audioVolume = { id = capabilities.audioVolume.ID } } }
+    }
+    local raw_levels = {
+      [camera_fields.MIN_VOLUME_LEVEL .. "_microphone"] = 100,
+      [camera_fields.MAX_VOLUME_LEVEL .. "_microphone"] = 100, -- unusable; forces a real profile change so we can inspect it
+    }
+    local fake_device = {
+      profile = { components = existing_components },
+      endpoints = {
+        {
+          endpoint_id = CAMERA_EP,
+          device_types = {
+            {device_type_id = 0x0142, device_type_revision = 1} -- Camera
+          },
+          clusters = {
+            {
+              cluster_id = clusters.CameraAvStreamManagement.ID,
+              feature_map = clusters.CameraAvStreamManagement.types.Feature.AUDIO |
+                clusters.CameraAvStreamManagement.types.Feature.SPEAKER,
+              cluster_type = "SERVER"
+            }
+          }
+        }
+      },
+      get_field = function(_, field) return raw_levels[field] end,
+      get_endpoints = function() return {} end,
+      supports_capability = function(_, capability, component)
+        local comp = existing_components[component]
+        if not comp then return false end
+        for _, cap in pairs(comp.capabilities) do
+          if cap.id == capability.ID then return true end
+        end
+        return false
+      end,
+      try_update_metadata = function(self, metadata) self.updated_metadata = metadata end,
+    }
+
+    camera_cfg.match_profile(fake_device)
+
+    assert(fake_device.updated_metadata ~= nil, "profile update should be requested")
+    local speaker_capabilities = component_capabilities(fake_device.updated_metadata, "speaker")
+    local microphone_capabilities = component_capabilities(fake_device.updated_metadata, "microphone")
+
+    assert(list_contains(speaker_capabilities, capabilities.audioVolume.ID), "audioVolume should be preserved on speaker while its range is unknown")
+    assert(list_contains(microphone_capabilities, capabilities.audioMute.ID), "audioMute should still be present on microphone")
+    assert(not list_contains(microphone_capabilities, capabilities.audioVolume.ID), "audioVolume should be excluded from microphone when min >= max")
+  end,
+  {
+    min_api_version = 14
+  }
+)
+
+test.register_coroutine_test(
+  "Speaker audioVolume should be removed from the profile when its volume range becomes unusable",
+  function()
+    update_device_profile()
+    test.wait_for_events()
+
+    test.socket.matter:__queue_receive({
+      mock_device.id,
+      clusters.CameraAvStreamManagement.server.attributes.SpeakerMaxLevel:build_test_report_data(mock_device, CAMERA_EP, 0)
+    })
+
+    local updated_expected_metadata = {
+      optional_component_capabilities = {
+        { "main",
+          { "videoCapture2", "cameraViewportSettings", "videoStreamSettings", "localMediaStorage", "audioRecording",
+            "cameraPrivacyMode", "imageControl", "hdr", "nightVision", "mechanicalPanTiltZoom", "zoneManagement",
+            "webrtc", "motionSensor", "sounds" }
+        },
+        { "statusLed",
+          { "switch", "mode" }
+        },
+        { "speaker",
+          { "audioMute" } -- audioVolume removed: reported max (0) is no longer greater than the known min (0)
+        },
+        { "microphone",
+          { "audioMute", "audioVolume" }
+        },
+        { "doorbell",
+          { "button" }
+        }
+      },
+      profile = "camera"
+    }
+    mock_device:expect_metadata_update(updated_expected_metadata)
+    test.socket.matter:__expect_send({mock_device.id, clusters.Switch.attributes.MultiPressMax:read(mock_device, DOORBELL_EP)})
+  end,
+  {
+    min_api_version = 14
+  }
+)
+
+test.register_coroutine_test(
+  "Speaker/Microphone volume range attributes should stay subscribed even when audioVolume isn't granted yet",
+  function()
+    -- Fresh pairing: no volume range has been reported yet, so audioVolume shouldn't be granted on
+    -- the very first profile match.
+    test.socket.matter:__queue_receive({
+      mock_device.id,
+      clusters.CameraAvStreamManagement.attributes.AttributeList:build_test_report_data(mock_device, CAMERA_EP, {
+        uint32(clusters.CameraAvStreamManagement.attributes.StatusLightEnabled.ID),
+        uint32(clusters.CameraAvStreamManagement.attributes.StatusLightBrightness.ID)
+      })
+    })
+    local first_pass_metadata = {
+      optional_component_capabilities = {
+        { "main",
+          { "videoCapture2", "cameraViewportSettings", "videoStreamSettings", "localMediaStorage", "audioRecording",
+            "cameraPrivacyMode", "imageControl", "hdr", "nightVision", "mechanicalPanTiltZoom", "zoneManagement",
+            "webrtc", "motionSensor", "sounds" }
+        },
+        { "statusLed", { "switch", "mode" } },
+        { "speaker", { "audioMute" } },
+        { "microphone", { "audioMute" } },
+        { "doorbell", { "button" } }
+      },
+      profile = "camera"
+    }
+    mock_device:expect_metadata_update(first_pass_metadata)
+    test.socket.matter:__expect_send({mock_device.id, clusters.Switch.attributes.MultiPressMax:read(mock_device, DOORBELL_EP)})
+    test.wait_for_events()
+
+    local first_pass_profile = t_utils.get_profile_definition(
+      "camera.yml", {enabled_optional_capabilities = first_pass_metadata.optional_component_capabilities}
+    )
+    test.wait_for_events()
+    test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed({ profile = first_pass_profile }))
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.webrtc.supportedFeatures(
+        {audio="sendrecv", bundle=true, order="audio/video", supportTrickleICE=true, turnSource="player", video="recvonly"}
+      ))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.mechanicalPanTiltZoom.supportedAttributes(
+        {"pan", "panRange", "tilt", "tiltRange", "zoom", "zoomRange", "presets", "maxPresets"}
+      ))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.zoneManagement.supportedFeatures(
+        {"triggerAugmentation", "perZoneSensitivity"}
+      ))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.localMediaStorage.supportedAttributes(
+        {"localVideoRecording"}
+      ))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.audioRecording.audioRecording("enabled"))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.videoStreamSettings.supportedFeatures(
+        {"liveStreaming", "clipRecording", "perStreamViewports", "watermark", "onScreenDisplay"}
+      ))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.cameraPrivacyMode.supportedAttributes(
+        {"softRecordingPrivacyMode", "softLivestreamPrivacyMode"}
+      ))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.cameraPrivacyMode.supportedCommands(
+        {"setSoftRecordingPrivacyMode", "setSoftLivestreamPrivacyMode"}
+      ))
+    )
+
+    -- audioVolume isn't active yet, so its current-value attributes shouldn't be (re-)subscribed, but
+    -- the min/max discovery attributes -- now bundled with audioMute -- must still be. Without that,
+    -- the driver could never learn the range needed to decide whether audioVolume belongs at all.
+    for _, attr in ipairs(additional_subscribed_attributes) do
+      if attr ~= clusters.CameraAvStreamManagement.attributes.SpeakerVolumeLevel and
+         attr ~= clusters.CameraAvStreamManagement.attributes.MicrophoneVolumeLevel then
+        subscribe_request:merge(attr:subscribe(mock_device))
+      end
+    end
+    test.socket.matter:__expect_send({mock_device.id, subscribe_request})
+    test.socket.matter:__expect_send({mock_device.id, clusters.Switch.attributes.MultiPressMax:read(mock_device, DOORBELL_EP)})
+  end,
+  {
+    min_api_version = 14
+  }
+)
+
+test.register_coroutine_test(
+  "Camera privacy mode supportedAttributes/supportedCommands should only expose hardPrivacyMode when PRIV feature is absent",
+  function()
+    local camera_cfg = require "sub_drivers.camera.camera_utils.device_configuration"
+
+    local emitted = {}
+    local fake_device = {
+      endpoints = {
+        {
+          endpoint_id = CAMERA_EP,
+          clusters = {
+            {
+              cluster_id = clusters.CameraAvStreamManagement.ID,
+              feature_map = clusters.CameraAvStreamManagement.types.Feature.VIDEO, -- no PRIVACY feature
+              cluster_type = "SERVER"
+            }
+          }
+        }
+      },
+      supports_capability = function(_, capability)
+        return capability == capabilities.cameraPrivacyMode
+      end,
+      get_field = function(_, field)
+        return field == camera_fields.HARD_PRIVACY_MODE_PRESENT
+      end,
+      get_endpoints = function(self, cluster_id, opts)
+        opts = opts or {}
+        local eps = {}
+        for _, ep in ipairs(self.endpoints) do
+          for _, clus in ipairs(ep.clusters) do
+            if clus.cluster_id == cluster_id and
+              (opts.feature_bitmap == nil or (clus.feature_map & opts.feature_bitmap) == opts.feature_bitmap) then
+              table.insert(eps, ep.endpoint_id)
+            end
+          end
+        end
+        return eps
+      end,
+      emit_event_for_endpoint = function(_, _, capability_event)
+        table.insert(emitted, capability_event)
+      end,
+    }
+
+    camera_cfg.initialize_camera_capabilities(fake_device)
+
+    local function list_equals(a, b)
+      if #a ~= #b then return false end
+      for i, v in ipairs(a) do
+        if v ~= b[i] then return false end
+      end
+      return true
+    end
+
+    local supported_attributes_event, supported_commands_event
+    for _, event in ipairs(emitted) do
+      if event.attribute == capabilities.cameraPrivacyMode.supportedAttributes then
+        supported_attributes_event = event
+      elseif event.attribute == capabilities.cameraPrivacyMode.supportedCommands then
+        supported_commands_event = event
+      end
+    end
+
+    assert(supported_attributes_event ~= nil, "supportedAttributes should be emitted")
+    assert(list_equals(supported_attributes_event.value.value, {"hardPrivacyMode"}),
+      "supportedAttributes should contain only hardPrivacyMode when PRIV feature is absent")
+    assert(supported_commands_event ~= nil, "supportedCommands should be emitted")
+    assert(list_equals(supported_commands_event.value.value, {}),
+      "supportedCommands should be empty when PRIV feature is absent, since HardPrivacyModeOn is read-only")
+  end,
+  {
+    min_api_version = 14
+  }
+)
+
 test.register_coroutine_test(
   "Reports mapping to EnabledState capability data type should generate appropriate events",
   function()
@@ -940,10 +1368,6 @@ test.register_coroutine_test(
         test.socket.capability:__expect_send(
           mock_device:generate_test_message("main", capabilities.imageControl.supportedAttributes({"imageFlipHorizontal", "imageFlipVertical"}))
         )
-      elseif v.capability == capabilities.cameraPrivacyMode.hardPrivacyMode then
-        test.socket.capability:__expect_send(
-          mock_device:generate_test_message("main", capabilities.cameraPrivacyMode.supportedAttributes({"softRecordingPrivacyMode", "softLivestreamPrivacyMode", "hardPrivacyMode"}))
-        )
       end
       test.socket.matter:__queue_receive({
         mock_device.id,
@@ -1156,6 +1580,56 @@ test.register_coroutine_test(
   }
 )
 
+test.register_coroutine_test(
+  "A volume level report racing a zero-width range update should not divide by zero",
+  function()
+    update_device_profile()
+    test.wait_for_events()
+
+    -- Narrow the range to min == max. This drops audioVolume from the profile, but the internal
+    -- MAX/MIN_VOLUME_LEVEL fields used for normalization are updated synchronously, before the
+    -- platform round-trips the narrowed profile back down.
+    test.socket.matter:__queue_receive({
+      mock_device.id,
+      clusters.CameraAvStreamManagement.server.attributes.SpeakerMaxLevel:build_test_report_data(mock_device, CAMERA_EP, 100)
+    })
+    test.socket.matter:__queue_receive({
+      mock_device.id,
+      clusters.CameraAvStreamManagement.server.attributes.SpeakerMinLevel:build_test_report_data(mock_device, CAMERA_EP, 100)
+    })
+    local updated_expected_metadata = {
+      optional_component_capabilities = {
+        { "main",
+          { "videoCapture2", "cameraViewportSettings", "videoStreamSettings", "localMediaStorage", "audioRecording",
+            "cameraPrivacyMode", "imageControl", "hdr", "nightVision", "mechanicalPanTiltZoom", "zoneManagement",
+            "webrtc", "motionSensor", "sounds" }
+        },
+        { "statusLed", { "switch", "mode" } },
+        { "speaker", { "audioMute" } }, -- audioVolume dropped: the range is now zero-width (100 == 100)
+        { "microphone", { "audioMute", "audioVolume" } },
+        { "doorbell", { "button" } }
+      },
+      profile = "camera"
+    }
+    mock_device:expect_metadata_update(updated_expected_metadata)
+    test.socket.matter:__expect_send({mock_device.id, clusters.Switch.attributes.MultiPressMax:read(mock_device, DOORBELL_EP)})
+    test.wait_for_events()
+
+    -- A late SpeakerVolumeLevel report can still arrive before the narrowed profile comes back down.
+    -- It should report a fixed value instead of dividing by (max - min) == 0.
+    test.socket.matter:__queue_receive({
+      mock_device.id,
+      clusters.CameraAvStreamManagement.attributes.SpeakerVolumeLevel:build_test_report_data(mock_device, CAMERA_EP, 100)
+    })
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("speaker", capabilities.audioVolume.volume(0))
+    )
+  end,
+  {
+     min_api_version = 14
+  }
+)
+
 test.register_coroutine_test(
   "Status Light Enabled reports should generate appropriate events",
   function()
@@ -2226,6 +2700,24 @@ test.register_coroutine_test(
   }
 )
 
+test.register_coroutine_test(
+  "Set PTZ command with a zoom-omitting setPanTiltZoom should not clamp the missing axis",
+  function()
+    update_device_profile()
+    test.wait_for_events()
+    test.socket.capability:__queue_receive({
+      mock_device.id,
+      { capability = "mechanicalPanTiltZoom", component = "main", command = "setPanTiltZoom", args = { 0, 0 } },
+    })
+    test.socket.matter:__expect_send({
+      mock_device.id, clusters.CameraAvSettingsUserLevelManagement.server.commands.MPTZSetPosition(mock_device, CAMERA_EP, 0, 0, nil)
+    })
+  end,
+  {
+     min_api_version = 14
+  }
+)
+
 test.register_coroutine_test(
   "Preset commands should send the appropriate commands",
   function()
@@ -3432,6 +3924,35 @@ test.register_coroutine_test(
   }
 )
 
+test.register_coroutine_test(
+  "Camera privacy mode supportedAttributes should include hardPrivacyMode when reported in AttributeList",
+  function()
+    update_device_profile()
+    test.wait_for_events()
+    test.socket.matter:__queue_receive({
+      mock_device.id,
+      clusters.CameraAvStreamManagement.attributes.AttributeList:build_test_report_data(mock_device, CAMERA_EP, {
+        uint32(clusters.CameraAvStreamManagement.attributes.StatusLightEnabled.ID),
+        uint32(clusters.CameraAvStreamManagement.attributes.StatusLightBrightness.ID),
+        uint32(clusters.CameraAvStreamManagement.attributes.HardPrivacyModeOn.ID)
+      })
+    })
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.cameraPrivacyMode.supportedAttributes(
+        {"softRecordingPrivacyMode", "softLivestreamPrivacyMode", "hardPrivacyMode"}
+      ))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.cameraPrivacyMode.supportedCommands(
+        {"setSoftRecordingPrivacyMode", "setSoftLivestreamPrivacyMode"}
+      ))
+    )
+  end,
+  {
+     min_api_version = 14
+  }
+)
+
 test.register_coroutine_test(
   "Camera profile should include zoneManagement when USER_DEFINED feature is present",
   function()