From 61007489de2e8afea0a47bb22dbd1e69595d1296 Mon Sep 17 00:00:00 2001
From: C Freeman <cecille@google.com>
Date: Tue, 1 Oct 2024 08:00:32 -0700
Subject: [PATCH] DM XMLs: Take spec scrape for 1.4 at 0.9 ballot (#35858)

* DM XML: Scrape spec at 0.9 sha

* DM XMLs: rename in-progress directory to 1.4

Also flip the default in the spec parsing to use 1.4
---
 .../clusters/ACL-Cluster.xml                  |  0
 .../clusters/AccountLogin.xml                 |  0
 .../clusters/AdminCommissioningCluster.xml    |  0
 .../clusters/AirQuality.xml                   |  0
 .../clusters/AlarmBase.xml                    |  0
 .../clusters/ApplicationBasic.xml             |  0
 .../clusters/ApplicationLauncher.xml          |  0
 .../clusters/AudioOutput.xml                  |  0
 .../clusters/BallastConfiguration.xml         |  0
 .../clusters/BasicInformationCluster.xml      |  7 +-
 .../clusters/Binding-Cluster.xml              |  0
 .../clusters/BooleanState.xml                 |  0
 .../clusters/BooleanStateConfiguration.xml    |  0
 .../{in_progress => 1.4}/clusters/Channel.xml |  0
 .../clusters/ColorControl.xml                 |  0
 .../clusters/CommissionerControlCluster.xml   |  2 +-
 .../clusters/ConcentrationMeasurement.xml     |  0
 .../clusters/ContentAppObserver.xml           |  0
 .../clusters/ContentControl.xml               |  0
 .../clusters/ContentLauncher.xml              |  0
 .../clusters/DemandResponseLoadControl.xml    |  0
 .../clusters/Descriptor-Cluster.xml           |  0
 .../clusters/DeviceEnergyManagement.xml       |  0
 .../clusters/DiagnosticLogsCluster.xml        |  0
 .../clusters/DiagnosticsEthernet.xml          |  0
 .../clusters/DiagnosticsGeneral.xml           |  1 +
 .../clusters/DiagnosticsSoftware.xml          |  0
 .../clusters/DiagnosticsThread.xml            |  0
 .../clusters/DiagnosticsWiFi.xml              |  0
 .../clusters/DishwasherAlarm.xml              |  0
 .../clusters/DoorLock.xml                     |  0
 .../clusters/ElectricalEnergyMeasurement.xml  |  0
 .../clusters/ElectricalPowerMeasurement.xml   |  0
 .../clusters/EnergyCalendar.xml               |  0
 .../clusters/EnergyEVSE.xml                   |  0
 .../clusters/EnergyPreference.xml             |  0
 .../clusters/FanControl.xml                   |  0
 .../clusters/FlowMeasurement.xml              |  0
 .../clusters/GeneralCommissioningCluster.xml  | 86 ++++++++++++++-----
 .../clusters/Group-Key-Management-Cluster.xml |  2 +-
 .../{in_progress => 1.4}/clusters/Groups.xml  |  0
 .../clusters/Humidistat.xml                   |  0
 .../clusters/ICDManagement.xml                | 54 +++++++++++-
 .../clusters/Identify.xml                     |  0
 .../clusters/IlluminanceMeasurement.xml       |  0
 .../clusters/JointFabricDatastoreCluster.xml  |  4 +-
 .../clusters/JointFabricPKICluster.xml        | 11 +--
 .../clusters/KeypadInput.xml                  |  0
 .../Label-Cluster-FixedLabelCluster.xml       |  0
 .../clusters/Label-Cluster-LabelCluster.xml   |  0
 .../Label-Cluster-UserLabelCluster.xml        |  0
 .../clusters/LaundryDryerControls.xml         |  0
 .../clusters/LaundryWasherControls.xml        |  0
 .../clusters/LevelControl.xml                 |  3 +-
 .../clusters/LocalizationConfiguration.xml    |  0
 .../clusters/LocalizationTimeFormat.xml       |  0
 .../clusters/LocalizationUnit.xml             |  0
 .../clusters/LowPower.xml                     |  0
 .../clusters/MediaInput.xml                   |  0
 .../clusters/MediaPlayback.xml                |  0
 .../clusters/Messages.xml                     |  0
 .../clusters/MicrowaveOvenControl.xml         |  0
 .../clusters/ModeBase.xml                     |  0
 .../clusters/ModeSelect.xml                   |  0
 .../clusters/Mode_DeviceEnergyManagement.xml  |  0
 .../clusters/Mode_Dishwasher.xml              |  0
 .../clusters/Mode_EVSE.xml                    |  0
 .../clusters/Mode_LaundryWasher.xml           |  0
 .../clusters/Mode_MicrowaveOven.xml           |  0
 .../clusters/Mode_Oven.xml                    |  0
 .../clusters/Mode_RVCClean.xml                |  0
 .../clusters/Mode_RVCRun.xml                  |  0
 .../clusters/Mode_Refrigerator.xml            |  0
 .../clusters/Mode_WaterHeater.xml             |  0
 .../clusters/NetworkCommissioningCluster.xml  |  4 +-
 .../clusters/OTAProvider.xml                  |  0
 .../clusters/OTARequestor.xml                 |  0
 .../clusters/OccupancySensing.xml             |  0
 .../{in_progress => 1.4}/clusters/OnOff.xml   |  0
 .../clusters/OperationalCredentialCluster.xml |  2 +-
 .../clusters/OperationalState.xml             |  0
 .../clusters/OperationalState_Oven.xml        |  0
 .../clusters/OperationalState_RVC.xml         |  0
 .../clusters/PowerSourceCluster.xml           |  6 +-
 .../PowerSourceConfigurationCluster.xml       |  0
 .../clusters/PowerTopology.xml                |  0
 .../clusters/PressureMeasurement.xml          |  0
 .../clusters/ProxyConfiguration-Cluster.xml   |  0
 .../clusters/ProxyDiscovery-Cluster.xml       |  0
 .../clusters/PumpConfigurationControl.xml     |  0
 .../clusters/RefrigeratorAlarm.xml            |  0
 .../clusters/ResourceMonitoring.xml           |  0
 .../{in_progress => 1.4}/clusters/Scenes.xml  |  0
 .../clusters/ServiceArea.xml                  |  1 -
 .../clusters/SmokeCOAlarm.xml                 |  0
 .../{in_progress => 1.4}/clusters/Switch.xml  |  0
 .../clusters/TargetNavigator.xml              |  0
 .../clusters/TemperatureControl.xml           |  0
 .../clusters/TemperatureMeasurement.xml       |  0
 .../clusters/Thermostat.xml                   |  0
 .../ThermostatUserInterfaceConfiguration.xml  |  0
 .../clusters/ThreadBorderRouterManagement.xml |  0
 .../clusters/ThreadNetworkDirectory.xml       |  0
 .../clusters/TimeSync.xml                     |  0
 .../clusters/ValidProxies-Cluster.xml         |  0
 .../clusters/ValveConfigurationControl.xml    |  0
 .../clusters/WakeOnLAN.xml                    |  0
 .../clusters/WaterContentMeasurement.xml      |  0
 .../clusters/WaterHeaterManagement.xml        |  0
 .../clusters/WiFiNetworkManagement.xml        |  0
 .../clusters/WindowCovering.xml               | 47 ++++++----
 .../bridge-clusters-ActionsCluster.xml        |  2 +
 ...s-BridgedDeviceBasicInformationCluster.xml |  5 +-
 ...e-clusters-EcosystemInformationCluster.xml | 14 ---
 .../clusters/cluster_ids.json                 |  0
 .../device_types/Aggregator.xml               |  9 +-
 .../device_types/AirPurifier.xml              |  0
 .../device_types/AirQualitySensor.xml         |  0
 .../device_types/BaseDeviceType.xml           |  0
 .../device_types/BasicVideoPlayer.xml         |  0
 .../device_types/BatteryStorage.xml           |  0
 .../device_types/BridgedNode.xml              | 17 +++-
 .../device_types/CastingVideoClient.xml       |  0
 .../device_types/CastingVideoPlayer.xml       |  0
 .../device_types/ColorDimmerSwitch.xml        |  0
 .../device_types/ColorTemperatureLight.xml    |  0
 .../device_types/ContactSensor.xml            |  0
 .../device_types/ContentApp.xml               |  0
 .../device_types/ControlBridge.xml            |  0
 .../device_types/CookSurface.xml              |  0
 .../device_types/Cooktop.xml                  |  0
 .../device_types/DeviceEnergyManagement.xml   |  0
 .../device_types/DimmableLight.xml            |  0
 .../device_types/DimmablePlug-InUnit.xml      |  0
 .../device_types/DimmerSwitch.xml             |  0
 .../device_types/Dishwasher.xml               |  0
 .../device_types/DoorLock.xml                 |  1 +
 .../device_types/DoorLockController.xml       |  0
 .../device_types/EVSE.xml                     |  0
 .../device_types/ElectricalSensor.xml         |  0
 .../device_types/EnergyTariff.xml             |  0
 .../device_types/EnergyTariffCalendar.xml     |  0
 .../device_types/ExtendedColorLight.xml       |  0
 .../device_types/ExtractorHood.xml            |  0
 .../{in_progress => 1.4}/device_types/Fan.xml |  0
 .../device_types/FlowSensor.xml               |  0
 .../device_types/GenericSwitch.xml            |  0
 .../device_types/HeatPump.xml                 |  0
 .../device_types/HumidifierDehumidifier.xml   |  0
 .../device_types/HumiditySensor.xml           |  0
 .../device_types/JointFabricAdmin.xml         |  0
 .../device_types/LaundryDryer.xml             |  0
 .../device_types/LaundryWasher.xml            |  0
 .../device_types/LightSensor.xml              |  0
 .../device_types/MicrowaveOven.xml            |  0
 .../device_types/ModeSelectDeviceType.xml     |  0
 .../MountedDimmableLoadControl.xml            |  0
 .../device_types/MountedOnOffControl.xml      |  0
 .../device_types/NetworkInfraIntro.xml        |  0
 .../device_types/NetworkInfraManager.xml      |  2 +-
 .../device_types/OccupancySensor.xml          |  0
 .../device_types/OnOffLight.xml               |  0
 .../device_types/OnOffLightSwitch.xml         |  0
 .../device_types/OnOffPlug-inUnit.xml         |  0
 .../device_types/OnOffSensor.xml              |  0
 .../device_types/OtaProvider.xml              |  0
 .../device_types/OtaRequestor.xml             |  0
 .../device_types/Oven.xml                     |  0
 .../device_types/PowerSource.xml              |  0
 .../device_types/PressureSensor.xml           |  0
 .../device_types/Pump.xml                     |  0
 .../device_types/PumpController.xml           |  0
 .../device_types/RainSensor.xml               |  0
 .../device_types/Refrigerator.xml             |  0
 .../device_types/RoboticVacuumCleaner.xml     |  6 +-
 .../device_types/RoomAirConditioner.xml       |  0
 .../device_types/RootNodeDeviceType.xml       | 10 ++-
 .../SecondaryNetworkInterface.xml             |  0
 .../device_types/SmokeCOAlarm.xml             |  0
 .../device_types/SolarPower.xml               |  0
 .../device_types/Speaker.xml                  |  0
 .../TemperatureControlledCabinet.xml          |  0
 .../device_types/TemperatureSensor.xml        |  0
 .../device_types/Thermostat.xml               |  0
 .../device_types/ThreadBorderRouter.xml       |  0
 .../device_types/VideoRemoteControl.xml       |  0
 .../device_types/WaterFreezeDetector.xml      |  0
 .../device_types/WaterHeater.xml              |  6 --
 .../device_types/WaterLeakDetector.xml        |  0
 .../device_types/WaterValve.xml               |  0
 .../device_types/WindowCovering.xml           |  0
 .../device_types/WindowCoveringController.xml |  0
 .../{in_progress => 1.4}/scraper_version      |  0
 data_model/1.4/spec_sha                       |  1 +
 data_model/in_progress/spec_sha               |  1 -
 src/python_testing/TestSpecParsingSupport.py  | 22 ++---
 src/python_testing/spec_parsing_support.py    | 10 +--
 197 files changed, 227 insertions(+), 109 deletions(-)
 rename data_model/{in_progress => 1.4}/clusters/ACL-Cluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/AccountLogin.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/AdminCommissioningCluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/AirQuality.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/AlarmBase.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ApplicationBasic.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ApplicationLauncher.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/AudioOutput.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/BallastConfiguration.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/BasicInformationCluster.xml (97%)
 rename data_model/{in_progress => 1.4}/clusters/Binding-Cluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/BooleanState.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/BooleanStateConfiguration.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Channel.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ColorControl.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/CommissionerControlCluster.xml (98%)
 rename data_model/{in_progress => 1.4}/clusters/ConcentrationMeasurement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ContentAppObserver.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ContentControl.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ContentLauncher.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/DemandResponseLoadControl.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Descriptor-Cluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/DeviceEnergyManagement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/DiagnosticLogsCluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/DiagnosticsEthernet.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/DiagnosticsGeneral.xml (99%)
 rename data_model/{in_progress => 1.4}/clusters/DiagnosticsSoftware.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/DiagnosticsThread.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/DiagnosticsWiFi.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/DishwasherAlarm.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/DoorLock.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ElectricalEnergyMeasurement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ElectricalPowerMeasurement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/EnergyCalendar.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/EnergyEVSE.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/EnergyPreference.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/FanControl.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/FlowMeasurement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/GeneralCommissioningCluster.xml (82%)
 rename data_model/{in_progress => 1.4}/clusters/Group-Key-Management-Cluster.xml (99%)
 rename data_model/{in_progress => 1.4}/clusters/Groups.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Humidistat.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ICDManagement.xml (81%)
 rename data_model/{in_progress => 1.4}/clusters/Identify.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/IlluminanceMeasurement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/JointFabricDatastoreCluster.xml (99%)
 rename data_model/{in_progress => 1.4}/clusters/JointFabricPKICluster.xml (95%)
 rename data_model/{in_progress => 1.4}/clusters/KeypadInput.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Label-Cluster-FixedLabelCluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Label-Cluster-LabelCluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Label-Cluster-UserLabelCluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/LaundryDryerControls.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/LaundryWasherControls.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/LevelControl.xml (98%)
 rename data_model/{in_progress => 1.4}/clusters/LocalizationConfiguration.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/LocalizationTimeFormat.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/LocalizationUnit.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/LowPower.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/MediaInput.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/MediaPlayback.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Messages.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/MicrowaveOvenControl.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ModeBase.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ModeSelect.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_DeviceEnergyManagement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_Dishwasher.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_EVSE.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_LaundryWasher.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_MicrowaveOven.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_Oven.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_RVCClean.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_RVCRun.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_Refrigerator.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Mode_WaterHeater.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/NetworkCommissioningCluster.xml (99%)
 rename data_model/{in_progress => 1.4}/clusters/OTAProvider.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/OTARequestor.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/OccupancySensing.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/OnOff.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/OperationalCredentialCluster.xml (99%)
 rename data_model/{in_progress => 1.4}/clusters/OperationalState.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/OperationalState_Oven.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/OperationalState_RVC.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/PowerSourceCluster.xml (99%)
 rename data_model/{in_progress => 1.4}/clusters/PowerSourceConfigurationCluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/PowerTopology.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/PressureMeasurement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ProxyConfiguration-Cluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ProxyDiscovery-Cluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/PumpConfigurationControl.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/RefrigeratorAlarm.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ResourceMonitoring.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Scenes.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ServiceArea.xml (99%)
 rename data_model/{in_progress => 1.4}/clusters/SmokeCOAlarm.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Switch.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/TargetNavigator.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/TemperatureControl.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/TemperatureMeasurement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/Thermostat.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ThermostatUserInterfaceConfiguration.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ThreadBorderRouterManagement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ThreadNetworkDirectory.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/TimeSync.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ValidProxies-Cluster.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/ValveConfigurationControl.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/WakeOnLAN.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/WaterContentMeasurement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/WaterHeaterManagement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/WiFiNetworkManagement.xml (100%)
 rename data_model/{in_progress => 1.4}/clusters/WindowCovering.xml (96%)
 rename data_model/{in_progress => 1.4}/clusters/bridge-clusters-ActionsCluster.xml (98%)
 rename data_model/{in_progress => 1.4}/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml (97%)
 rename data_model/{in_progress => 1.4}/clusters/bridge-clusters-EcosystemInformationCluster.xml (87%)
 rename data_model/{in_progress => 1.4}/clusters/cluster_ids.json (100%)
 rename data_model/{in_progress => 1.4}/device_types/Aggregator.xml (90%)
 rename data_model/{in_progress => 1.4}/device_types/AirPurifier.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/AirQualitySensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/BaseDeviceType.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/BasicVideoPlayer.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/BatteryStorage.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/BridgedNode.xml (86%)
 rename data_model/{in_progress => 1.4}/device_types/CastingVideoClient.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/CastingVideoPlayer.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ColorDimmerSwitch.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ColorTemperatureLight.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ContactSensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ContentApp.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ControlBridge.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/CookSurface.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/Cooktop.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/DeviceEnergyManagement.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/DimmableLight.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/DimmablePlug-InUnit.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/DimmerSwitch.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/Dishwasher.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/DoorLock.xml (98%)
 rename data_model/{in_progress => 1.4}/device_types/DoorLockController.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/EVSE.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ElectricalSensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/EnergyTariff.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/EnergyTariffCalendar.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ExtendedColorLight.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ExtractorHood.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/Fan.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/FlowSensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/GenericSwitch.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/HeatPump.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/HumidifierDehumidifier.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/HumiditySensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/JointFabricAdmin.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/LaundryDryer.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/LaundryWasher.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/LightSensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/MicrowaveOven.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ModeSelectDeviceType.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/MountedDimmableLoadControl.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/MountedOnOffControl.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/NetworkInfraIntro.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/NetworkInfraManager.xml (97%)
 rename data_model/{in_progress => 1.4}/device_types/OccupancySensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/OnOffLight.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/OnOffLightSwitch.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/OnOffPlug-inUnit.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/OnOffSensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/OtaProvider.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/OtaRequestor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/Oven.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/PowerSource.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/PressureSensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/Pump.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/PumpController.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/RainSensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/Refrigerator.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/RoboticVacuumCleaner.xml (93%)
 rename data_model/{in_progress => 1.4}/device_types/RoomAirConditioner.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/RootNodeDeviceType.xml (94%)
 rename data_model/{in_progress => 1.4}/device_types/SecondaryNetworkInterface.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/SmokeCOAlarm.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/SolarPower.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/Speaker.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/TemperatureControlledCabinet.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/TemperatureSensor.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/Thermostat.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/ThreadBorderRouter.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/VideoRemoteControl.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/WaterFreezeDetector.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/WaterHeater.xml (93%)
 rename data_model/{in_progress => 1.4}/device_types/WaterLeakDetector.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/WaterValve.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/WindowCovering.xml (100%)
 rename data_model/{in_progress => 1.4}/device_types/WindowCoveringController.xml (100%)
 rename data_model/{in_progress => 1.4}/scraper_version (100%)
 create mode 100644 data_model/1.4/spec_sha
 delete mode 100644 data_model/in_progress/spec_sha

diff --git a/data_model/in_progress/clusters/ACL-Cluster.xml b/data_model/1.4/clusters/ACL-Cluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/ACL-Cluster.xml
rename to data_model/1.4/clusters/ACL-Cluster.xml
diff --git a/data_model/in_progress/clusters/AccountLogin.xml b/data_model/1.4/clusters/AccountLogin.xml
similarity index 100%
rename from data_model/in_progress/clusters/AccountLogin.xml
rename to data_model/1.4/clusters/AccountLogin.xml
diff --git a/data_model/in_progress/clusters/AdminCommissioningCluster.xml b/data_model/1.4/clusters/AdminCommissioningCluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/AdminCommissioningCluster.xml
rename to data_model/1.4/clusters/AdminCommissioningCluster.xml
diff --git a/data_model/in_progress/clusters/AirQuality.xml b/data_model/1.4/clusters/AirQuality.xml
similarity index 100%
rename from data_model/in_progress/clusters/AirQuality.xml
rename to data_model/1.4/clusters/AirQuality.xml
diff --git a/data_model/in_progress/clusters/AlarmBase.xml b/data_model/1.4/clusters/AlarmBase.xml
similarity index 100%
rename from data_model/in_progress/clusters/AlarmBase.xml
rename to data_model/1.4/clusters/AlarmBase.xml
diff --git a/data_model/in_progress/clusters/ApplicationBasic.xml b/data_model/1.4/clusters/ApplicationBasic.xml
similarity index 100%
rename from data_model/in_progress/clusters/ApplicationBasic.xml
rename to data_model/1.4/clusters/ApplicationBasic.xml
diff --git a/data_model/in_progress/clusters/ApplicationLauncher.xml b/data_model/1.4/clusters/ApplicationLauncher.xml
similarity index 100%
rename from data_model/in_progress/clusters/ApplicationLauncher.xml
rename to data_model/1.4/clusters/ApplicationLauncher.xml
diff --git a/data_model/in_progress/clusters/AudioOutput.xml b/data_model/1.4/clusters/AudioOutput.xml
similarity index 100%
rename from data_model/in_progress/clusters/AudioOutput.xml
rename to data_model/1.4/clusters/AudioOutput.xml
diff --git a/data_model/in_progress/clusters/BallastConfiguration.xml b/data_model/1.4/clusters/BallastConfiguration.xml
similarity index 100%
rename from data_model/in_progress/clusters/BallastConfiguration.xml
rename to data_model/1.4/clusters/BallastConfiguration.xml
diff --git a/data_model/in_progress/clusters/BasicInformationCluster.xml b/data_model/1.4/clusters/BasicInformationCluster.xml
similarity index 97%
rename from data_model/in_progress/clusters/BasicInformationCluster.xml
rename to data_model/1.4/clusters/BasicInformationCluster.xml
index 168a0353761159..483cd643e65bda 100644
--- a/data_model/in_progress/clusters/BasicInformationCluster.xml
+++ b/data_model/1.4/clusters/BasicInformationCluster.xml
@@ -60,7 +60,7 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added ProductAppearance attribute"/>
     <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
-    <revision revision="4" summary="Updated conformance for UniqueID to mandatory. Added DeviceLocation attribute."/>
+    <revision revision="4" summary="Updated conformance for UniqueID to mandatory."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0028" name="Basic Information"/>
@@ -303,11 +303,6 @@ Davis, CA 95616, USA
       <mandatoryConform/>
       <constraint type="min" value="1"/>
     </attribute>
-    <attribute id="0x0017" name="DeviceLocation" type="locationdesc" default="MS">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform/>
-    </attribute>
   </attributes>
   <events>
     <event id="0x00" name="StartUp" priority="critical">
diff --git a/data_model/in_progress/clusters/Binding-Cluster.xml b/data_model/1.4/clusters/Binding-Cluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/Binding-Cluster.xml
rename to data_model/1.4/clusters/Binding-Cluster.xml
diff --git a/data_model/in_progress/clusters/BooleanState.xml b/data_model/1.4/clusters/BooleanState.xml
similarity index 100%
rename from data_model/in_progress/clusters/BooleanState.xml
rename to data_model/1.4/clusters/BooleanState.xml
diff --git a/data_model/in_progress/clusters/BooleanStateConfiguration.xml b/data_model/1.4/clusters/BooleanStateConfiguration.xml
similarity index 100%
rename from data_model/in_progress/clusters/BooleanStateConfiguration.xml
rename to data_model/1.4/clusters/BooleanStateConfiguration.xml
diff --git a/data_model/in_progress/clusters/Channel.xml b/data_model/1.4/clusters/Channel.xml
similarity index 100%
rename from data_model/in_progress/clusters/Channel.xml
rename to data_model/1.4/clusters/Channel.xml
diff --git a/data_model/in_progress/clusters/ColorControl.xml b/data_model/1.4/clusters/ColorControl.xml
similarity index 100%
rename from data_model/in_progress/clusters/ColorControl.xml
rename to data_model/1.4/clusters/ColorControl.xml
diff --git a/data_model/in_progress/clusters/CommissionerControlCluster.xml b/data_model/1.4/clusters/CommissionerControlCluster.xml
similarity index 98%
rename from data_model/in_progress/clusters/CommissionerControlCluster.xml
rename to data_model/1.4/clusters/CommissionerControlCluster.xml
index d3b8380aaba929..d02e9592ee232d 100644
--- a/data_model/in_progress/clusters/CommissionerControlCluster.xml
+++ b/data_model/1.4/clusters/CommissionerControlCluster.xml
@@ -116,7 +116,7 @@ Davis, CA 95616, USA
       </field>
       <field id="2" name="Discriminator" type="uint16">
         <mandatoryConform/>
-        <constraint type="between" from="0" to="4095"/>
+        <constraint type="max" value="4095"/>
       </field>
       <field id="3" name="Iterations" type="uint32">
         <mandatoryConform/>
diff --git a/data_model/in_progress/clusters/ConcentrationMeasurement.xml b/data_model/1.4/clusters/ConcentrationMeasurement.xml
similarity index 100%
rename from data_model/in_progress/clusters/ConcentrationMeasurement.xml
rename to data_model/1.4/clusters/ConcentrationMeasurement.xml
diff --git a/data_model/in_progress/clusters/ContentAppObserver.xml b/data_model/1.4/clusters/ContentAppObserver.xml
similarity index 100%
rename from data_model/in_progress/clusters/ContentAppObserver.xml
rename to data_model/1.4/clusters/ContentAppObserver.xml
diff --git a/data_model/in_progress/clusters/ContentControl.xml b/data_model/1.4/clusters/ContentControl.xml
similarity index 100%
rename from data_model/in_progress/clusters/ContentControl.xml
rename to data_model/1.4/clusters/ContentControl.xml
diff --git a/data_model/in_progress/clusters/ContentLauncher.xml b/data_model/1.4/clusters/ContentLauncher.xml
similarity index 100%
rename from data_model/in_progress/clusters/ContentLauncher.xml
rename to data_model/1.4/clusters/ContentLauncher.xml
diff --git a/data_model/in_progress/clusters/DemandResponseLoadControl.xml b/data_model/1.4/clusters/DemandResponseLoadControl.xml
similarity index 100%
rename from data_model/in_progress/clusters/DemandResponseLoadControl.xml
rename to data_model/1.4/clusters/DemandResponseLoadControl.xml
diff --git a/data_model/in_progress/clusters/Descriptor-Cluster.xml b/data_model/1.4/clusters/Descriptor-Cluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/Descriptor-Cluster.xml
rename to data_model/1.4/clusters/Descriptor-Cluster.xml
diff --git a/data_model/in_progress/clusters/DeviceEnergyManagement.xml b/data_model/1.4/clusters/DeviceEnergyManagement.xml
similarity index 100%
rename from data_model/in_progress/clusters/DeviceEnergyManagement.xml
rename to data_model/1.4/clusters/DeviceEnergyManagement.xml
diff --git a/data_model/in_progress/clusters/DiagnosticLogsCluster.xml b/data_model/1.4/clusters/DiagnosticLogsCluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/DiagnosticLogsCluster.xml
rename to data_model/1.4/clusters/DiagnosticLogsCluster.xml
diff --git a/data_model/in_progress/clusters/DiagnosticsEthernet.xml b/data_model/1.4/clusters/DiagnosticsEthernet.xml
similarity index 100%
rename from data_model/in_progress/clusters/DiagnosticsEthernet.xml
rename to data_model/1.4/clusters/DiagnosticsEthernet.xml
diff --git a/data_model/in_progress/clusters/DiagnosticsGeneral.xml b/data_model/1.4/clusters/DiagnosticsGeneral.xml
similarity index 99%
rename from data_model/in_progress/clusters/DiagnosticsGeneral.xml
rename to data_model/1.4/clusters/DiagnosticsGeneral.xml
index 1266705ba6d0dc..44b891fbcd6ea4 100644
--- a/data_model/in_progress/clusters/DiagnosticsGeneral.xml
+++ b/data_model/1.4/clusters/DiagnosticsGeneral.xml
@@ -263,6 +263,7 @@ Davis, CA 95616, USA
       <mandatoryConform/>
     </attribute>
     <attribute id="0x0009" name="DoNotUse">
+      <access read="true" readPrivilege="view"/>
       <disallowConform/>
     </attribute>
   </attributes>
diff --git a/data_model/in_progress/clusters/DiagnosticsSoftware.xml b/data_model/1.4/clusters/DiagnosticsSoftware.xml
similarity index 100%
rename from data_model/in_progress/clusters/DiagnosticsSoftware.xml
rename to data_model/1.4/clusters/DiagnosticsSoftware.xml
diff --git a/data_model/in_progress/clusters/DiagnosticsThread.xml b/data_model/1.4/clusters/DiagnosticsThread.xml
similarity index 100%
rename from data_model/in_progress/clusters/DiagnosticsThread.xml
rename to data_model/1.4/clusters/DiagnosticsThread.xml
diff --git a/data_model/in_progress/clusters/DiagnosticsWiFi.xml b/data_model/1.4/clusters/DiagnosticsWiFi.xml
similarity index 100%
rename from data_model/in_progress/clusters/DiagnosticsWiFi.xml
rename to data_model/1.4/clusters/DiagnosticsWiFi.xml
diff --git a/data_model/in_progress/clusters/DishwasherAlarm.xml b/data_model/1.4/clusters/DishwasherAlarm.xml
similarity index 100%
rename from data_model/in_progress/clusters/DishwasherAlarm.xml
rename to data_model/1.4/clusters/DishwasherAlarm.xml
diff --git a/data_model/in_progress/clusters/DoorLock.xml b/data_model/1.4/clusters/DoorLock.xml
similarity index 100%
rename from data_model/in_progress/clusters/DoorLock.xml
rename to data_model/1.4/clusters/DoorLock.xml
diff --git a/data_model/in_progress/clusters/ElectricalEnergyMeasurement.xml b/data_model/1.4/clusters/ElectricalEnergyMeasurement.xml
similarity index 100%
rename from data_model/in_progress/clusters/ElectricalEnergyMeasurement.xml
rename to data_model/1.4/clusters/ElectricalEnergyMeasurement.xml
diff --git a/data_model/in_progress/clusters/ElectricalPowerMeasurement.xml b/data_model/1.4/clusters/ElectricalPowerMeasurement.xml
similarity index 100%
rename from data_model/in_progress/clusters/ElectricalPowerMeasurement.xml
rename to data_model/1.4/clusters/ElectricalPowerMeasurement.xml
diff --git a/data_model/in_progress/clusters/EnergyCalendar.xml b/data_model/1.4/clusters/EnergyCalendar.xml
similarity index 100%
rename from data_model/in_progress/clusters/EnergyCalendar.xml
rename to data_model/1.4/clusters/EnergyCalendar.xml
diff --git a/data_model/in_progress/clusters/EnergyEVSE.xml b/data_model/1.4/clusters/EnergyEVSE.xml
similarity index 100%
rename from data_model/in_progress/clusters/EnergyEVSE.xml
rename to data_model/1.4/clusters/EnergyEVSE.xml
diff --git a/data_model/in_progress/clusters/EnergyPreference.xml b/data_model/1.4/clusters/EnergyPreference.xml
similarity index 100%
rename from data_model/in_progress/clusters/EnergyPreference.xml
rename to data_model/1.4/clusters/EnergyPreference.xml
diff --git a/data_model/in_progress/clusters/FanControl.xml b/data_model/1.4/clusters/FanControl.xml
similarity index 100%
rename from data_model/in_progress/clusters/FanControl.xml
rename to data_model/1.4/clusters/FanControl.xml
diff --git a/data_model/in_progress/clusters/FlowMeasurement.xml b/data_model/1.4/clusters/FlowMeasurement.xml
similarity index 100%
rename from data_model/in_progress/clusters/FlowMeasurement.xml
rename to data_model/1.4/clusters/FlowMeasurement.xml
diff --git a/data_model/in_progress/clusters/GeneralCommissioningCluster.xml b/data_model/1.4/clusters/GeneralCommissioningCluster.xml
similarity index 82%
rename from data_model/in_progress/clusters/GeneralCommissioningCluster.xml
rename to data_model/1.4/clusters/GeneralCommissioningCluster.xml
index a569fef5d44118..01450f959dfea3 100644
--- a/data_model/in_progress/clusters/GeneralCommissioningCluster.xml
+++ b/data_model/1.4/clusters/GeneralCommissioningCluster.xml
@@ -64,6 +64,11 @@ Davis, CA 95616, USA
     <clusterId id="0x0030" name="General Commissioning"/>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="CGEN" scope="Node"/>
+  <features>
+    <feature bit="0" code="TC" name="TermsAndConditions" summary="Supports Terms &amp; Conditions acknowledgement">
+      <provisionalConform/>
+    </feature>
+  </features>
   <dataTypes>
     <enum name="CommissioningErrorEnum">
       <item value="0" name="OK" summary="No error">
@@ -81,6 +86,21 @@ Davis, CA 95616, USA
       <item value="4" name="BusyWithOtherAdmin" summary="[[ref_BusyWithOtherAdmin]] Attempting to arm fail-safe or execute CommissioningComplete from a fabric different than the one associated with the current fail-safe context.">
         <mandatoryConform/>
       </item>
+      <item value="5" name="RequiredTCNotAccepted" summary="[[ref_RequiredTCNotAccepted]] One or more required TC features from the Enhanced Setup Flow were not accepted.">
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="TCAcknowledgementsNotReceived" summary="[[ref_TCAcknowledgementsNotReceived, TCAcknowledgementsNotReceived]] No acknowledgements from the user for the TC features were received.">
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="TCMinVersionNotMet" summary="[[ref_TCMinVersionNotMet, TCMinVersionNotMet]] The version of the TC features acknowledged by the user did not meet the minimum required version.">
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </item>
     </enum>
     <enum name="RegulatoryLocationTypeEnum">
       <item value="0" name="Indoor" summary="Indoor only">
@@ -131,37 +151,52 @@ Davis, CA 95616, USA
     <attribute id="0x0005" name="TCAcceptedVersion" type="uint16">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
     <attribute id="0x0006" name="TCMinRequiredVersion" type="uint16">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
     <attribute id="0x0007" name="TCAcknowledgements" type="map16">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
     <attribute id="0x0008" name="TCAcknowledgementsRequired" type="bool" default="true">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
     <attribute id="0x0009" name="TCUpdateDeadline" type="uint32">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
   </attributes>
   <commands>
@@ -223,9 +258,12 @@ Davis, CA 95616, USA
     </command>
     <command id="0x06" name="SetTCAcknowledgements" direction="commandToServer" response="SetTCAcknowledgementsResponse">
       <access invokePrivilege="admin"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
       <field id="0" name="TCVersion" type="uint16">
         <mandatoryConform/>
       </field>
@@ -234,9 +272,15 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x07" name="SetTCAcknowledgementsResponse" direction="responseFromServer">
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="OK">
+        <mandatoryConform/>
+      </field>
     </command>
   </commands>
 </cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/Group-Key-Management-Cluster.xml b/data_model/1.4/clusters/Group-Key-Management-Cluster.xml
similarity index 99%
rename from data_model/in_progress/clusters/Group-Key-Management-Cluster.xml
rename to data_model/1.4/clusters/Group-Key-Management-Cluster.xml
index 784bdc903ec186..1974047c01acf0 100644
--- a/data_model/in_progress/clusters/Group-Key-Management-Cluster.xml
+++ b/data_model/1.4/clusters/Group-Key-Management-Cluster.xml
@@ -220,7 +220,7 @@ Davis, CA 95616, USA
     <command id="0x04" name="KeySetReadAllIndices Command" direction="commandToServer" response="KeySetReadAllIndicesResponse Command">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="reserved">
+      <field id="0" name="DoNotUse">
         <disallowConform/>
       </field>
     </command>
diff --git a/data_model/in_progress/clusters/Groups.xml b/data_model/1.4/clusters/Groups.xml
similarity index 100%
rename from data_model/in_progress/clusters/Groups.xml
rename to data_model/1.4/clusters/Groups.xml
diff --git a/data_model/in_progress/clusters/Humidistat.xml b/data_model/1.4/clusters/Humidistat.xml
similarity index 100%
rename from data_model/in_progress/clusters/Humidistat.xml
rename to data_model/1.4/clusters/Humidistat.xml
diff --git a/data_model/in_progress/clusters/ICDManagement.xml b/data_model/1.4/clusters/ICDManagement.xml
similarity index 81%
rename from data_model/in_progress/clusters/ICDManagement.xml
rename to data_model/1.4/clusters/ICDManagement.xml
index 830f62fba2a63f..b6f76f48e2b137 100644
--- a/data_model/in_progress/clusters/ICDManagement.xml
+++ b/data_model/1.4/clusters/ICDManagement.xml
@@ -103,7 +103,6 @@ Davis, CA 95616, USA
   </features>
   <dataTypes>
     <number name="ClientType Field" type=""/>
-    <number name="UserActiveModeTriggerBitmap" type=""/>
     <enum name="OperatingModeEnum">
       <item value="0" name="SIT" summary="ICD is operating as a Short Idle Time ICD.">
         <mandatoryConform/>
@@ -112,6 +111,59 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </item>
     </enum>
+    <bitmap name="UserActiveModeTriggerBitmap">
+      <bitfield name="PowerCycle" bit="0" summary="Power Cycle to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SettingsMenu" bit="1" summary="Settings menu on the device informs how to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CustomInstruction" bit="2" summary="Custom Instruction on how to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="DeviceManual" bit="3" summary="Device Manual informs how to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensor" bit="4" summary="Actuate Sensor to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensorSeconds" bit="5" summary="Actuate Sensor for N seconds to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensorTimes" bit="6" summary="Actuate Sensor N times to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensorLightsBlink" bit="7" summary="Actuate Sensor until light blinks to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButton" bit="8" summary="Press Reset Button to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButtonLightsBlink" bit="9" summary="Press Reset Button until light blinks to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButtonSeconds" bit="10" summary="Press Reset Button for N seconds to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButtonTimes" bit="11" summary="Press Reset Button N times to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButton" bit="12" summary="Press Setup Button to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButtonSeconds" bit="13" summary="Press Setup Button for N seconds to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButtonLightsBlink" bit="14" summary="Press Setup Button until light blinks to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButtonTimes" bit="15" summary="Press Setup Button N times to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AppDefinedButton" bit="16" summary="Press the N Button to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
     <struct name="MonitoringRegistrationStruct">
       <field id="1" name="CheckInNodeID" type="node-id">
         <access fabricSensitive="true"/>
diff --git a/data_model/in_progress/clusters/Identify.xml b/data_model/1.4/clusters/Identify.xml
similarity index 100%
rename from data_model/in_progress/clusters/Identify.xml
rename to data_model/1.4/clusters/Identify.xml
diff --git a/data_model/in_progress/clusters/IlluminanceMeasurement.xml b/data_model/1.4/clusters/IlluminanceMeasurement.xml
similarity index 100%
rename from data_model/in_progress/clusters/IlluminanceMeasurement.xml
rename to data_model/1.4/clusters/IlluminanceMeasurement.xml
diff --git a/data_model/in_progress/clusters/JointFabricDatastoreCluster.xml b/data_model/1.4/clusters/JointFabricDatastoreCluster.xml
similarity index 99%
rename from data_model/in_progress/clusters/JointFabricDatastoreCluster.xml
rename to data_model/1.4/clusters/JointFabricDatastoreCluster.xml
index 137edd2857f74d..4557cfae7fdf41 100644
--- a/data_model/in_progress/clusters/JointFabricDatastoreCluster.xml
+++ b/data_model/1.4/clusters/JointFabricDatastoreCluster.xml
@@ -60,7 +60,9 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
-    <clusterId id="0x0752" name="Joint Fabric Datastore Cluster"/>
+    <clusterId id="0x0752" name="Joint Fabric Datastore Cluster">
+      <provisionalConform/>
+    </clusterId>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="JFDS" scope="Node"/>
   <dataTypes>
diff --git a/data_model/in_progress/clusters/JointFabricPKICluster.xml b/data_model/1.4/clusters/JointFabricPKICluster.xml
similarity index 95%
rename from data_model/in_progress/clusters/JointFabricPKICluster.xml
rename to data_model/1.4/clusters/JointFabricPKICluster.xml
index 847d2548e3b1f1..41c9823626b528 100644
--- a/data_model/in_progress/clusters/JointFabricPKICluster.xml
+++ b/data_model/1.4/clusters/JointFabricPKICluster.xml
@@ -60,7 +60,9 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
-    <clusterId id="0x0753" name="Joint Fabric PKI"/>
+    <clusterId id="0x0753" name="Joint Fabric PKI">
+      <provisionalConform/>
+    </clusterId>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="JFPKI" scope="Node"/>
   <dataTypes>
@@ -121,18 +123,17 @@ Davis, CA 95616, USA
         <constraint type="maxLength" value="400"/>
       </field>
     </command>
-    <command id="0x02" name="Transfer Anchor Request Command" direction="commandToClient" response="Transfer Anchor Response Command">
+    <command id="0x02" name="Transfer Anchor Request Command" direction="commandToServer" response="Transfer Anchor Response Command">
       <access invokePrivilege="admin"/>
       <mandatoryConform/>
     </command>
-    <command id="0x03" name="Transfer Anchor Response Command" direction="responseFromClient">
-      <access invokePrivilege="admin"/>
+    <command id="0x03" name="Transfer Anchor Response Command" direction="responseFromServer">
       <mandatoryConform/>
       <field id="0" name="ref_TransferAnchorResponseStatusCode" type="Transfer Anchor Response Status Enum">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x04" name="Transfer Anchor Complete Command" direction="commandToClient" response="Y">
+    <command id="0x04" name="Transfer Anchor Complete Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin"/>
       <mandatoryConform/>
     </command>
diff --git a/data_model/in_progress/clusters/KeypadInput.xml b/data_model/1.4/clusters/KeypadInput.xml
similarity index 100%
rename from data_model/in_progress/clusters/KeypadInput.xml
rename to data_model/1.4/clusters/KeypadInput.xml
diff --git a/data_model/in_progress/clusters/Label-Cluster-FixedLabelCluster.xml b/data_model/1.4/clusters/Label-Cluster-FixedLabelCluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/Label-Cluster-FixedLabelCluster.xml
rename to data_model/1.4/clusters/Label-Cluster-FixedLabelCluster.xml
diff --git a/data_model/in_progress/clusters/Label-Cluster-LabelCluster.xml b/data_model/1.4/clusters/Label-Cluster-LabelCluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/Label-Cluster-LabelCluster.xml
rename to data_model/1.4/clusters/Label-Cluster-LabelCluster.xml
diff --git a/data_model/in_progress/clusters/Label-Cluster-UserLabelCluster.xml b/data_model/1.4/clusters/Label-Cluster-UserLabelCluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/Label-Cluster-UserLabelCluster.xml
rename to data_model/1.4/clusters/Label-Cluster-UserLabelCluster.xml
diff --git a/data_model/in_progress/clusters/LaundryDryerControls.xml b/data_model/1.4/clusters/LaundryDryerControls.xml
similarity index 100%
rename from data_model/in_progress/clusters/LaundryDryerControls.xml
rename to data_model/1.4/clusters/LaundryDryerControls.xml
diff --git a/data_model/in_progress/clusters/LaundryWasherControls.xml b/data_model/1.4/clusters/LaundryWasherControls.xml
similarity index 100%
rename from data_model/in_progress/clusters/LaundryWasherControls.xml
rename to data_model/1.4/clusters/LaundryWasherControls.xml
diff --git a/data_model/in_progress/clusters/LevelControl.xml b/data_model/1.4/clusters/LevelControl.xml
similarity index 98%
rename from data_model/in_progress/clusters/LevelControl.xml
rename to data_model/1.4/clusters/LevelControl.xml
index de342812287b0f..404b1250e90acc 100644
--- a/data_model/in_progress/clusters/LevelControl.xml
+++ b/data_model/1.4/clusters/LevelControl.xml
@@ -136,7 +136,7 @@ Davis, CA 95616, USA
       <optionalConform>
         <feature name="LT"/>
       </optionalConform>
-      <constraint type="min" value="1"/>
+      <constraint type="between" from="1" to="254"/>
     </attribute>
     <attribute id="0x0002" name="MinLevel" type="uint8" default="0">
       <access read="true" readPrivilege="view"/>
@@ -145,6 +145,7 @@ Davis, CA 95616, USA
           <feature name="LT"/>
         </notTerm>
       </optionalConform>
+      <constraint type="max" value="254"/>
     </attribute>
     <attribute id="0x0003" name="MaxLevel" type="uint8" default="254">
       <access read="true" readPrivilege="view"/>
diff --git a/data_model/in_progress/clusters/LocalizationConfiguration.xml b/data_model/1.4/clusters/LocalizationConfiguration.xml
similarity index 100%
rename from data_model/in_progress/clusters/LocalizationConfiguration.xml
rename to data_model/1.4/clusters/LocalizationConfiguration.xml
diff --git a/data_model/in_progress/clusters/LocalizationTimeFormat.xml b/data_model/1.4/clusters/LocalizationTimeFormat.xml
similarity index 100%
rename from data_model/in_progress/clusters/LocalizationTimeFormat.xml
rename to data_model/1.4/clusters/LocalizationTimeFormat.xml
diff --git a/data_model/in_progress/clusters/LocalizationUnit.xml b/data_model/1.4/clusters/LocalizationUnit.xml
similarity index 100%
rename from data_model/in_progress/clusters/LocalizationUnit.xml
rename to data_model/1.4/clusters/LocalizationUnit.xml
diff --git a/data_model/in_progress/clusters/LowPower.xml b/data_model/1.4/clusters/LowPower.xml
similarity index 100%
rename from data_model/in_progress/clusters/LowPower.xml
rename to data_model/1.4/clusters/LowPower.xml
diff --git a/data_model/in_progress/clusters/MediaInput.xml b/data_model/1.4/clusters/MediaInput.xml
similarity index 100%
rename from data_model/in_progress/clusters/MediaInput.xml
rename to data_model/1.4/clusters/MediaInput.xml
diff --git a/data_model/in_progress/clusters/MediaPlayback.xml b/data_model/1.4/clusters/MediaPlayback.xml
similarity index 100%
rename from data_model/in_progress/clusters/MediaPlayback.xml
rename to data_model/1.4/clusters/MediaPlayback.xml
diff --git a/data_model/in_progress/clusters/Messages.xml b/data_model/1.4/clusters/Messages.xml
similarity index 100%
rename from data_model/in_progress/clusters/Messages.xml
rename to data_model/1.4/clusters/Messages.xml
diff --git a/data_model/in_progress/clusters/MicrowaveOvenControl.xml b/data_model/1.4/clusters/MicrowaveOvenControl.xml
similarity index 100%
rename from data_model/in_progress/clusters/MicrowaveOvenControl.xml
rename to data_model/1.4/clusters/MicrowaveOvenControl.xml
diff --git a/data_model/in_progress/clusters/ModeBase.xml b/data_model/1.4/clusters/ModeBase.xml
similarity index 100%
rename from data_model/in_progress/clusters/ModeBase.xml
rename to data_model/1.4/clusters/ModeBase.xml
diff --git a/data_model/in_progress/clusters/ModeSelect.xml b/data_model/1.4/clusters/ModeSelect.xml
similarity index 100%
rename from data_model/in_progress/clusters/ModeSelect.xml
rename to data_model/1.4/clusters/ModeSelect.xml
diff --git a/data_model/in_progress/clusters/Mode_DeviceEnergyManagement.xml b/data_model/1.4/clusters/Mode_DeviceEnergyManagement.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_DeviceEnergyManagement.xml
rename to data_model/1.4/clusters/Mode_DeviceEnergyManagement.xml
diff --git a/data_model/in_progress/clusters/Mode_Dishwasher.xml b/data_model/1.4/clusters/Mode_Dishwasher.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_Dishwasher.xml
rename to data_model/1.4/clusters/Mode_Dishwasher.xml
diff --git a/data_model/in_progress/clusters/Mode_EVSE.xml b/data_model/1.4/clusters/Mode_EVSE.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_EVSE.xml
rename to data_model/1.4/clusters/Mode_EVSE.xml
diff --git a/data_model/in_progress/clusters/Mode_LaundryWasher.xml b/data_model/1.4/clusters/Mode_LaundryWasher.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_LaundryWasher.xml
rename to data_model/1.4/clusters/Mode_LaundryWasher.xml
diff --git a/data_model/in_progress/clusters/Mode_MicrowaveOven.xml b/data_model/1.4/clusters/Mode_MicrowaveOven.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_MicrowaveOven.xml
rename to data_model/1.4/clusters/Mode_MicrowaveOven.xml
diff --git a/data_model/in_progress/clusters/Mode_Oven.xml b/data_model/1.4/clusters/Mode_Oven.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_Oven.xml
rename to data_model/1.4/clusters/Mode_Oven.xml
diff --git a/data_model/in_progress/clusters/Mode_RVCClean.xml b/data_model/1.4/clusters/Mode_RVCClean.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_RVCClean.xml
rename to data_model/1.4/clusters/Mode_RVCClean.xml
diff --git a/data_model/in_progress/clusters/Mode_RVCRun.xml b/data_model/1.4/clusters/Mode_RVCRun.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_RVCRun.xml
rename to data_model/1.4/clusters/Mode_RVCRun.xml
diff --git a/data_model/in_progress/clusters/Mode_Refrigerator.xml b/data_model/1.4/clusters/Mode_Refrigerator.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_Refrigerator.xml
rename to data_model/1.4/clusters/Mode_Refrigerator.xml
diff --git a/data_model/in_progress/clusters/Mode_WaterHeater.xml b/data_model/1.4/clusters/Mode_WaterHeater.xml
similarity index 100%
rename from data_model/in_progress/clusters/Mode_WaterHeater.xml
rename to data_model/1.4/clusters/Mode_WaterHeater.xml
diff --git a/data_model/in_progress/clusters/NetworkCommissioningCluster.xml b/data_model/1.4/clusters/NetworkCommissioningCluster.xml
similarity index 99%
rename from data_model/in_progress/clusters/NetworkCommissioningCluster.xml
rename to data_model/1.4/clusters/NetworkCommissioningCluster.xml
index 1a511ed18fda3a..8ee15e1b47ad3d 100644
--- a/data_model/in_progress/clusters/NetworkCommissioningCluster.xml
+++ b/data_model/1.4/clusters/NetworkCommissioningCluster.xml
@@ -185,7 +185,7 @@ Davis, CA 95616, USA
         <mandatoryConform>
           <feature name="TH"/>
         </mandatoryConform>
-        <constraint type="between" from="0" to="65534"/>
+        <constraint type="max" value="65534"/>
       </field>
       <field id="1" name="ExtendedPanId" type="uint64">
         <mandatoryConform>
@@ -452,7 +452,7 @@ Davis, CA 95616, USA
       </field>
       <field id="2" name="NetworkIndex" type="uint8">
         <optionalConform/>
-        <constraint type="between" from="0" to="MaxNetworks - 1"/>
+        <constraint type="max" value="MaxNetworks - 1"/>
       </field>
     </command>
     <command id="0x06" name="ConnectNetwork" direction="commandToServer" response="ConnectNetworkResponse">
diff --git a/data_model/in_progress/clusters/OTAProvider.xml b/data_model/1.4/clusters/OTAProvider.xml
similarity index 100%
rename from data_model/in_progress/clusters/OTAProvider.xml
rename to data_model/1.4/clusters/OTAProvider.xml
diff --git a/data_model/in_progress/clusters/OTARequestor.xml b/data_model/1.4/clusters/OTARequestor.xml
similarity index 100%
rename from data_model/in_progress/clusters/OTARequestor.xml
rename to data_model/1.4/clusters/OTARequestor.xml
diff --git a/data_model/in_progress/clusters/OccupancySensing.xml b/data_model/1.4/clusters/OccupancySensing.xml
similarity index 100%
rename from data_model/in_progress/clusters/OccupancySensing.xml
rename to data_model/1.4/clusters/OccupancySensing.xml
diff --git a/data_model/in_progress/clusters/OnOff.xml b/data_model/1.4/clusters/OnOff.xml
similarity index 100%
rename from data_model/in_progress/clusters/OnOff.xml
rename to data_model/1.4/clusters/OnOff.xml
diff --git a/data_model/in_progress/clusters/OperationalCredentialCluster.xml b/data_model/1.4/clusters/OperationalCredentialCluster.xml
similarity index 99%
rename from data_model/in_progress/clusters/OperationalCredentialCluster.xml
rename to data_model/1.4/clusters/OperationalCredentialCluster.xml
index 338a8af007c5b9..26ae2c57a257b2 100644
--- a/data_model/in_progress/clusters/OperationalCredentialCluster.xml
+++ b/data_model/1.4/clusters/OperationalCredentialCluster.xml
@@ -264,7 +264,7 @@ Davis, CA 95616, USA
         <mandatoryConform/>
         <constraint type="maxLength" value="16"/>
       </field>
-      <field id="3" name="CaseAdminSubject" type="SubjectID">
+      <field id="3" name="CaseAdminSubject" type="ref_SubjectId">
         <mandatoryConform/>
       </field>
       <field id="4" name="AdminVendorId" type="vendor-id">
diff --git a/data_model/in_progress/clusters/OperationalState.xml b/data_model/1.4/clusters/OperationalState.xml
similarity index 100%
rename from data_model/in_progress/clusters/OperationalState.xml
rename to data_model/1.4/clusters/OperationalState.xml
diff --git a/data_model/in_progress/clusters/OperationalState_Oven.xml b/data_model/1.4/clusters/OperationalState_Oven.xml
similarity index 100%
rename from data_model/in_progress/clusters/OperationalState_Oven.xml
rename to data_model/1.4/clusters/OperationalState_Oven.xml
diff --git a/data_model/in_progress/clusters/OperationalState_RVC.xml b/data_model/1.4/clusters/OperationalState_RVC.xml
similarity index 100%
rename from data_model/in_progress/clusters/OperationalState_RVC.xml
rename to data_model/1.4/clusters/OperationalState_RVC.xml
diff --git a/data_model/in_progress/clusters/PowerSourceCluster.xml b/data_model/1.4/clusters/PowerSourceCluster.xml
similarity index 99%
rename from data_model/in_progress/clusters/PowerSourceCluster.xml
rename to data_model/1.4/clusters/PowerSourceCluster.xml
index a0b6b91c565dd8..82491aaa741720 100644
--- a/data_model/in_progress/clusters/PowerSourceCluster.xml
+++ b/data_model/1.4/clusters/PowerSourceCluster.xml
@@ -67,10 +67,10 @@ Davis, CA 95616, USA
   <classification hierarchy="base" role="utility" picsCode="PS" scope="Node"/>
   <features>
     <feature bit="0" code="WIRED" name="Wired" summary="A wired power source">
-      <optionalConform/>
+      <optionalConform choice="a"/>
     </feature>
     <feature bit="1" code="BAT" name="Battery" summary="A battery power source">
-      <optionalConform/>
+      <optionalConform choice="a"/>
     </feature>
     <feature bit="2" code="RECHG" name="Rechargeable" summary="A rechargeable battery power source">
       <optionalConform>
@@ -636,7 +636,7 @@ Davis, CA 95616, USA
       <optionalConform>
         <feature name="BAT"/>
       </optionalConform>
-      <constraint type="between" from="0" to="200"/>
+      <constraint type="max" value="200"/>
     </attribute>
     <attribute id="0x000D" name="BatTimeRemaining" type="uint32">
       <access read="true" readPrivilege="view"/>
diff --git a/data_model/in_progress/clusters/PowerSourceConfigurationCluster.xml b/data_model/1.4/clusters/PowerSourceConfigurationCluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/PowerSourceConfigurationCluster.xml
rename to data_model/1.4/clusters/PowerSourceConfigurationCluster.xml
diff --git a/data_model/in_progress/clusters/PowerTopology.xml b/data_model/1.4/clusters/PowerTopology.xml
similarity index 100%
rename from data_model/in_progress/clusters/PowerTopology.xml
rename to data_model/1.4/clusters/PowerTopology.xml
diff --git a/data_model/in_progress/clusters/PressureMeasurement.xml b/data_model/1.4/clusters/PressureMeasurement.xml
similarity index 100%
rename from data_model/in_progress/clusters/PressureMeasurement.xml
rename to data_model/1.4/clusters/PressureMeasurement.xml
diff --git a/data_model/in_progress/clusters/ProxyConfiguration-Cluster.xml b/data_model/1.4/clusters/ProxyConfiguration-Cluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/ProxyConfiguration-Cluster.xml
rename to data_model/1.4/clusters/ProxyConfiguration-Cluster.xml
diff --git a/data_model/in_progress/clusters/ProxyDiscovery-Cluster.xml b/data_model/1.4/clusters/ProxyDiscovery-Cluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/ProxyDiscovery-Cluster.xml
rename to data_model/1.4/clusters/ProxyDiscovery-Cluster.xml
diff --git a/data_model/in_progress/clusters/PumpConfigurationControl.xml b/data_model/1.4/clusters/PumpConfigurationControl.xml
similarity index 100%
rename from data_model/in_progress/clusters/PumpConfigurationControl.xml
rename to data_model/1.4/clusters/PumpConfigurationControl.xml
diff --git a/data_model/in_progress/clusters/RefrigeratorAlarm.xml b/data_model/1.4/clusters/RefrigeratorAlarm.xml
similarity index 100%
rename from data_model/in_progress/clusters/RefrigeratorAlarm.xml
rename to data_model/1.4/clusters/RefrigeratorAlarm.xml
diff --git a/data_model/in_progress/clusters/ResourceMonitoring.xml b/data_model/1.4/clusters/ResourceMonitoring.xml
similarity index 100%
rename from data_model/in_progress/clusters/ResourceMonitoring.xml
rename to data_model/1.4/clusters/ResourceMonitoring.xml
diff --git a/data_model/in_progress/clusters/Scenes.xml b/data_model/1.4/clusters/Scenes.xml
similarity index 100%
rename from data_model/in_progress/clusters/Scenes.xml
rename to data_model/1.4/clusters/Scenes.xml
diff --git a/data_model/in_progress/clusters/ServiceArea.xml b/data_model/1.4/clusters/ServiceArea.xml
similarity index 99%
rename from data_model/in_progress/clusters/ServiceArea.xml
rename to data_model/1.4/clusters/ServiceArea.xml
index 2533d4b549d2f0..3ea629625cb1ee 100644
--- a/data_model/in_progress/clusters/ServiceArea.xml
+++ b/data_model/1.4/clusters/ServiceArea.xml
@@ -227,7 +227,6 @@ Davis, CA 95616, USA
       </mandatoryConform>
       <field id="0" name="Status" type="SkipAreaStatus">
         <mandatoryConform/>
-        <constraint type="desc"/>
       </field>
       <field id="1" name="StatusText" type="string">
         <mandatoryConform/>
diff --git a/data_model/in_progress/clusters/SmokeCOAlarm.xml b/data_model/1.4/clusters/SmokeCOAlarm.xml
similarity index 100%
rename from data_model/in_progress/clusters/SmokeCOAlarm.xml
rename to data_model/1.4/clusters/SmokeCOAlarm.xml
diff --git a/data_model/in_progress/clusters/Switch.xml b/data_model/1.4/clusters/Switch.xml
similarity index 100%
rename from data_model/in_progress/clusters/Switch.xml
rename to data_model/1.4/clusters/Switch.xml
diff --git a/data_model/in_progress/clusters/TargetNavigator.xml b/data_model/1.4/clusters/TargetNavigator.xml
similarity index 100%
rename from data_model/in_progress/clusters/TargetNavigator.xml
rename to data_model/1.4/clusters/TargetNavigator.xml
diff --git a/data_model/in_progress/clusters/TemperatureControl.xml b/data_model/1.4/clusters/TemperatureControl.xml
similarity index 100%
rename from data_model/in_progress/clusters/TemperatureControl.xml
rename to data_model/1.4/clusters/TemperatureControl.xml
diff --git a/data_model/in_progress/clusters/TemperatureMeasurement.xml b/data_model/1.4/clusters/TemperatureMeasurement.xml
similarity index 100%
rename from data_model/in_progress/clusters/TemperatureMeasurement.xml
rename to data_model/1.4/clusters/TemperatureMeasurement.xml
diff --git a/data_model/in_progress/clusters/Thermostat.xml b/data_model/1.4/clusters/Thermostat.xml
similarity index 100%
rename from data_model/in_progress/clusters/Thermostat.xml
rename to data_model/1.4/clusters/Thermostat.xml
diff --git a/data_model/in_progress/clusters/ThermostatUserInterfaceConfiguration.xml b/data_model/1.4/clusters/ThermostatUserInterfaceConfiguration.xml
similarity index 100%
rename from data_model/in_progress/clusters/ThermostatUserInterfaceConfiguration.xml
rename to data_model/1.4/clusters/ThermostatUserInterfaceConfiguration.xml
diff --git a/data_model/in_progress/clusters/ThreadBorderRouterManagement.xml b/data_model/1.4/clusters/ThreadBorderRouterManagement.xml
similarity index 100%
rename from data_model/in_progress/clusters/ThreadBorderRouterManagement.xml
rename to data_model/1.4/clusters/ThreadBorderRouterManagement.xml
diff --git a/data_model/in_progress/clusters/ThreadNetworkDirectory.xml b/data_model/1.4/clusters/ThreadNetworkDirectory.xml
similarity index 100%
rename from data_model/in_progress/clusters/ThreadNetworkDirectory.xml
rename to data_model/1.4/clusters/ThreadNetworkDirectory.xml
diff --git a/data_model/in_progress/clusters/TimeSync.xml b/data_model/1.4/clusters/TimeSync.xml
similarity index 100%
rename from data_model/in_progress/clusters/TimeSync.xml
rename to data_model/1.4/clusters/TimeSync.xml
diff --git a/data_model/in_progress/clusters/ValidProxies-Cluster.xml b/data_model/1.4/clusters/ValidProxies-Cluster.xml
similarity index 100%
rename from data_model/in_progress/clusters/ValidProxies-Cluster.xml
rename to data_model/1.4/clusters/ValidProxies-Cluster.xml
diff --git a/data_model/in_progress/clusters/ValveConfigurationControl.xml b/data_model/1.4/clusters/ValveConfigurationControl.xml
similarity index 100%
rename from data_model/in_progress/clusters/ValveConfigurationControl.xml
rename to data_model/1.4/clusters/ValveConfigurationControl.xml
diff --git a/data_model/in_progress/clusters/WakeOnLAN.xml b/data_model/1.4/clusters/WakeOnLAN.xml
similarity index 100%
rename from data_model/in_progress/clusters/WakeOnLAN.xml
rename to data_model/1.4/clusters/WakeOnLAN.xml
diff --git a/data_model/in_progress/clusters/WaterContentMeasurement.xml b/data_model/1.4/clusters/WaterContentMeasurement.xml
similarity index 100%
rename from data_model/in_progress/clusters/WaterContentMeasurement.xml
rename to data_model/1.4/clusters/WaterContentMeasurement.xml
diff --git a/data_model/in_progress/clusters/WaterHeaterManagement.xml b/data_model/1.4/clusters/WaterHeaterManagement.xml
similarity index 100%
rename from data_model/in_progress/clusters/WaterHeaterManagement.xml
rename to data_model/1.4/clusters/WaterHeaterManagement.xml
diff --git a/data_model/in_progress/clusters/WiFiNetworkManagement.xml b/data_model/1.4/clusters/WiFiNetworkManagement.xml
similarity index 100%
rename from data_model/in_progress/clusters/WiFiNetworkManagement.xml
rename to data_model/1.4/clusters/WiFiNetworkManagement.xml
diff --git a/data_model/in_progress/clusters/WindowCovering.xml b/data_model/1.4/clusters/WindowCovering.xml
similarity index 96%
rename from data_model/in_progress/clusters/WindowCovering.xml
rename to data_model/1.4/clusters/WindowCovering.xml
index 09133513af736a..dd6d2293cc31f2 100644
--- a/data_model/in_progress/clusters/WindowCovering.xml
+++ b/data_model/1.4/clusters/WindowCovering.xml
@@ -305,23 +305,33 @@ Davis, CA 95616, USA
       <bitfield name="Operational" bit="0" summary="Device is operational.">
         <mandatoryConform/>
       </bitfield>
-      <bitfield name="OnlineReserved" bit="1" summary="Deprecated and reserved.">
-        <mandatoryConform/>
+      <bitfield name="OnlineReserved" bit="1">
+        <deprecateConform/>
       </bitfield>
       <bitfield name="LiftMovementReversed" bit="2" summary="The lift movement is reversed.">
-        <mandatoryConform/>
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
       </bitfield>
       <bitfield name="LiftPositionAware" bit="3" summary="Supports the PositionAwareLift feature (PA_LF).">
-        <mandatoryConform/>
+        <mandatoryConform>
+          <feature name="PA_LF"/>
+        </mandatoryConform>
       </bitfield>
       <bitfield name="TiltPositionAware" bit="4" summary="Supports the PositionAwareTilt feature (PA_TL).">
-        <mandatoryConform/>
+        <mandatoryConform>
+          <feature name="PA_TL"/>
+        </mandatoryConform>
       </bitfield>
       <bitfield name="LiftEncoderControlled" bit="5" summary="Uses an encoder for lift.">
-        <mandatoryConform/>
+        <mandatoryConform>
+          <feature name="PA_LF"/>
+        </mandatoryConform>
       </bitfield>
       <bitfield name="TiltEncoderControlled" bit="6" summary="Uses an encoder for tilt.">
-        <mandatoryConform/>
+        <mandatoryConform>
+          <feature name="PA_TL"/>
+        </mandatoryConform>
       </bitfield>
     </bitmap>
     <bitmap name="ModeBitmap">
@@ -343,10 +353,14 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </bitfield>
       <bitfield name="Lift" from="3" to="2" summary="Lift operational state.">
-        <mandatoryConform/>
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
       </bitfield>
       <bitfield name="Tilt" from="5" to="4" summary="Tilt operational state.">
-        <mandatoryConform/>
+        <mandatoryConform>
+          <feature name="TL"/>
+        </mandatoryConform>
       </bitfield>
     </bitmap>
     <bitmap name="SafetyStatusBitmap">
@@ -480,7 +494,6 @@ Davis, CA 95616, USA
           <feature name="PA_TL"/>
         </andTerm>
       </optionalConform>
-      <constraint type="between" from="0" to="100"/>
     </attribute>
     <attribute id="0x000A" name="OperationalStatus" type="OperationalStatusBitmap" default="0">
       <access read="true" readPrivilege="view"/>
@@ -523,7 +536,7 @@ Davis, CA 95616, USA
           <feature name="PA_LF"/>
         </andTerm>
       </mandatoryConform>
-      <constraint type="between" from="0" to="10000"/>
+      <constraint type="max" value="10000"/>
     </attribute>
     <attribute id="0x000F" name="CurrentPositionTiltPercent100ths" type="percent100ths" default="null">
       <access read="true" readPrivilege="view"/>
@@ -534,7 +547,7 @@ Davis, CA 95616, USA
           <feature name="PA_TL"/>
         </andTerm>
       </mandatoryConform>
-      <constraint type="between" from="0" to="10000"/>
+      <constraint type="max" value="10000"/>
     </attribute>
     <attribute id="0x0010" name="InstalledOpenLimitLift" type="uint16" default="0">
       <access read="true" readPrivilege="view"/>
@@ -546,7 +559,7 @@ Davis, CA 95616, USA
           <feature name="ABS"/>
         </andTerm>
       </mandatoryConform>
-      <constraint type="between" from="0" to="65534"/>
+      <constraint type="max" value="65534"/>
     </attribute>
     <attribute id="0x0011" name="InstalledClosedLimitLift" type="uint16" default="65534">
       <access read="true" readPrivilege="view"/>
@@ -558,7 +571,7 @@ Davis, CA 95616, USA
           <feature name="ABS"/>
         </andTerm>
       </mandatoryConform>
-      <constraint type="between" from="0" to="65534"/>
+      <constraint type="max" value="65534"/>
     </attribute>
     <attribute id="0x0012" name="InstalledOpenLimitTilt" type="uint16" default="0">
       <access read="true" readPrivilege="view"/>
@@ -570,7 +583,7 @@ Davis, CA 95616, USA
           <feature name="ABS"/>
         </andTerm>
       </mandatoryConform>
-      <constraint type="between" from="0" to="65534"/>
+      <constraint type="max" value="65534"/>
     </attribute>
     <attribute id="0x0013" name="InstalledClosedLimitTilt" type="uint16" default="65534">
       <access read="true" readPrivilege="view"/>
@@ -582,7 +595,7 @@ Davis, CA 95616, USA
           <feature name="ABS"/>
         </andTerm>
       </mandatoryConform>
-      <constraint type="between" from="0" to="65534"/>
+      <constraint type="max" value="65534"/>
     </attribute>
     <attribute id="0x0014" name="VelocityLift">
       <deprecateConform/>
@@ -593,7 +606,7 @@ Davis, CA 95616, USA
     <attribute id="0x0016" name="DecelerationTimeLift">
       <deprecateConform/>
     </attribute>
-    <attribute id="0x0017" name="Mode" type="ModeBitmap" default="0">
+    <attribute id="0x0017" name="Mode" type="ModeBitmap Type." default="0">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
diff --git a/data_model/in_progress/clusters/bridge-clusters-ActionsCluster.xml b/data_model/1.4/clusters/bridge-clusters-ActionsCluster.xml
similarity index 98%
rename from data_model/in_progress/clusters/bridge-clusters-ActionsCluster.xml
rename to data_model/1.4/clusters/bridge-clusters-ActionsCluster.xml
index 4874aca26bc504..354e24c424417d 100644
--- a/data_model/in_progress/clusters/bridge-clusters-ActionsCluster.xml
+++ b/data_model/1.4/clusters/bridge-clusters-ActionsCluster.xml
@@ -166,6 +166,7 @@ Davis, CA 95616, USA
       </field>
       <field id="1" name="Name" type="string">
         <mandatoryConform/>
+        <constraint type="maxLength" value="128{32}"/>
       </field>
       <field id="2" name="Type" type="ActionTypeEnum">
         <mandatoryConform/>
@@ -189,6 +190,7 @@ Davis, CA 95616, USA
       <field id="1" name="Name" type="string">
         <access read="true"/>
         <mandatoryConform/>
+        <constraint type="maxLength" value="128{32}"/>
       </field>
       <field id="2" name="Type" type="EndpointListTypeEnum">
         <access read="true"/>
diff --git a/data_model/in_progress/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml b/data_model/1.4/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml
similarity index 97%
rename from data_model/in_progress/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml
rename to data_model/1.4/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml
index 62633f55cf08cc..3f7eda5f1ea87c 100644
--- a/data_model/in_progress/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml
+++ b/data_model/1.4/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml
@@ -62,7 +62,7 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added ProductAppearance attribute"/>
     <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
-    <revision revision="4" summary="Updated conformance for UniqueID to mandatory, ProductID to optional when bridging Matter devices, and add the BridgedICDSupport feature. Added DeviceLocation."/>
+    <revision revision="4" summary="Updated conformance for UniqueID to mandatory, ProductID to optional when bridging Matter devices, add the BridgedICDSupport feature."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0039" name="Bridged Device Basic Information"/>
@@ -141,9 +141,6 @@ Davis, CA 95616, USA
     <attribute id="0x0016" name="MaxPathsPerInvoke">
       <disallowConform/>
     </attribute>
-    <attribute id="0x0017" name="DeviceLocation">
-      <optionalConform/>
-    </attribute>
   </attributes>
   <commands>
     <command id="0x80" name="KeepActive" direction="commandToServer" response="Y">
diff --git a/data_model/in_progress/clusters/bridge-clusters-EcosystemInformationCluster.xml b/data_model/1.4/clusters/bridge-clusters-EcosystemInformationCluster.xml
similarity index 87%
rename from data_model/in_progress/clusters/bridge-clusters-EcosystemInformationCluster.xml
rename to data_model/1.4/clusters/bridge-clusters-EcosystemInformationCluster.xml
index ddebe95679370e..67c2bbbd108cd0 100644
--- a/data_model/in_progress/clusters/bridge-clusters-EcosystemInformationCluster.xml
+++ b/data_model/1.4/clusters/bridge-clusters-EcosystemInformationCluster.xml
@@ -120,18 +120,4 @@ Davis, CA 95616, USA
       <access fabricScoped="true"/>
     </struct>
   </dataTypes>
-  <attributes>
-    <attribute id="0x0000" name="DeviceDirectory" type="list">
-      <entry type="EcosystemDeviceStruct"/>
-      <access read="true" readPrivilege="manage" fabricScoped="true"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0001" name="LocationDirectory" type="list">
-      <entry type="EcosystemLocationStruct"/>
-      <access read="true" readPrivilege="manage" fabricScoped="true"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-    </attribute>
-  </attributes>
 </cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/cluster_ids.json b/data_model/1.4/clusters/cluster_ids.json
similarity index 100%
rename from data_model/in_progress/clusters/cluster_ids.json
rename to data_model/1.4/clusters/cluster_ids.json
diff --git a/data_model/in_progress/device_types/Aggregator.xml b/data_model/1.4/device_types/Aggregator.xml
similarity index 90%
rename from data_model/in_progress/device_types/Aggregator.xml
rename to data_model/1.4/device_types/Aggregator.xml
index a99ee1108c3b50..be604976521c54 100644
--- a/data_model/in_progress/device_types/Aggregator.xml
+++ b/data_model/1.4/device_types/Aggregator.xml
@@ -55,12 +55,12 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000E" name="Aggregator" revision="1">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000E" name="Aggregator" revision="2">
   <revisionHistory>
     <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Commissioner Control Cluster and FabricSynchronization Condition."/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
-  <conditions/>
   <clusters>
     <cluster id="0x0003" name="Identify" side="server">
       <optionalConform/>
@@ -68,5 +68,10 @@ Davis, CA 95616, USA
     <cluster id="0x0025" name="Actions" side="server">
       <optionalConform/>
     </cluster>
+    <cluster id="0x0751" name="Commissioner Control" side="server">
+      <mandatoryConform>
+        <attribute name="FabricSynchronization"/>
+      </mandatoryConform>
+    </cluster>
   </clusters>
 </deviceType>
\ No newline at end of file
diff --git a/data_model/in_progress/device_types/AirPurifier.xml b/data_model/1.4/device_types/AirPurifier.xml
similarity index 100%
rename from data_model/in_progress/device_types/AirPurifier.xml
rename to data_model/1.4/device_types/AirPurifier.xml
diff --git a/data_model/in_progress/device_types/AirQualitySensor.xml b/data_model/1.4/device_types/AirQualitySensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/AirQualitySensor.xml
rename to data_model/1.4/device_types/AirQualitySensor.xml
diff --git a/data_model/in_progress/device_types/BaseDeviceType.xml b/data_model/1.4/device_types/BaseDeviceType.xml
similarity index 100%
rename from data_model/in_progress/device_types/BaseDeviceType.xml
rename to data_model/1.4/device_types/BaseDeviceType.xml
diff --git a/data_model/in_progress/device_types/BasicVideoPlayer.xml b/data_model/1.4/device_types/BasicVideoPlayer.xml
similarity index 100%
rename from data_model/in_progress/device_types/BasicVideoPlayer.xml
rename to data_model/1.4/device_types/BasicVideoPlayer.xml
diff --git a/data_model/in_progress/device_types/BatteryStorage.xml b/data_model/1.4/device_types/BatteryStorage.xml
similarity index 100%
rename from data_model/in_progress/device_types/BatteryStorage.xml
rename to data_model/1.4/device_types/BatteryStorage.xml
diff --git a/data_model/in_progress/device_types/BridgedNode.xml b/data_model/1.4/device_types/BridgedNode.xml
similarity index 86%
rename from data_model/in_progress/device_types/BridgedNode.xml
rename to data_model/1.4/device_types/BridgedNode.xml
index 6f309001975627..1ea7a1984f57f5 100644
--- a/data_model/in_progress/device_types/BridgedNode.xml
+++ b/data_model/1.4/device_types/BridgedNode.xml
@@ -55,13 +55,13 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0013" name="Bridged Node" revision="2">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0013" name="Bridged Node" revision="3">
   <revisionHistory>
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
+    <revision revision="3" summary="Added Ecosystem Information Cluster and FabricSynchronizedNode Condition."/>
   </revisionHistory>
   <classification class="utility" scope="endpoint"/>
-  <conditions/>
   <clusters>
     <cluster id="0x002E" name="Power Source Configuration" side="server">
       <otherwiseConform>
@@ -79,5 +79,18 @@ Davis, CA 95616, USA
     <cluster id="0x0039" name="Bridged Device Basic Information" side="server">
       <mandatoryConform/>
     </cluster>
+    <cluster id="0x003C" name="Administrator Commissioning" side="server">
+      <mandatoryConform>
+        <attribute name="FabricSynchronizedNode"/>
+      </mandatoryConform>
+    </cluster>
+    <cluster id="0x0750" name="Ecosystem Information" side="server">
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="FabricSynchronizedNode"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </cluster>
   </clusters>
 </deviceType>
\ No newline at end of file
diff --git a/data_model/in_progress/device_types/CastingVideoClient.xml b/data_model/1.4/device_types/CastingVideoClient.xml
similarity index 100%
rename from data_model/in_progress/device_types/CastingVideoClient.xml
rename to data_model/1.4/device_types/CastingVideoClient.xml
diff --git a/data_model/in_progress/device_types/CastingVideoPlayer.xml b/data_model/1.4/device_types/CastingVideoPlayer.xml
similarity index 100%
rename from data_model/in_progress/device_types/CastingVideoPlayer.xml
rename to data_model/1.4/device_types/CastingVideoPlayer.xml
diff --git a/data_model/in_progress/device_types/ColorDimmerSwitch.xml b/data_model/1.4/device_types/ColorDimmerSwitch.xml
similarity index 100%
rename from data_model/in_progress/device_types/ColorDimmerSwitch.xml
rename to data_model/1.4/device_types/ColorDimmerSwitch.xml
diff --git a/data_model/in_progress/device_types/ColorTemperatureLight.xml b/data_model/1.4/device_types/ColorTemperatureLight.xml
similarity index 100%
rename from data_model/in_progress/device_types/ColorTemperatureLight.xml
rename to data_model/1.4/device_types/ColorTemperatureLight.xml
diff --git a/data_model/in_progress/device_types/ContactSensor.xml b/data_model/1.4/device_types/ContactSensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/ContactSensor.xml
rename to data_model/1.4/device_types/ContactSensor.xml
diff --git a/data_model/in_progress/device_types/ContentApp.xml b/data_model/1.4/device_types/ContentApp.xml
similarity index 100%
rename from data_model/in_progress/device_types/ContentApp.xml
rename to data_model/1.4/device_types/ContentApp.xml
diff --git a/data_model/in_progress/device_types/ControlBridge.xml b/data_model/1.4/device_types/ControlBridge.xml
similarity index 100%
rename from data_model/in_progress/device_types/ControlBridge.xml
rename to data_model/1.4/device_types/ControlBridge.xml
diff --git a/data_model/in_progress/device_types/CookSurface.xml b/data_model/1.4/device_types/CookSurface.xml
similarity index 100%
rename from data_model/in_progress/device_types/CookSurface.xml
rename to data_model/1.4/device_types/CookSurface.xml
diff --git a/data_model/in_progress/device_types/Cooktop.xml b/data_model/1.4/device_types/Cooktop.xml
similarity index 100%
rename from data_model/in_progress/device_types/Cooktop.xml
rename to data_model/1.4/device_types/Cooktop.xml
diff --git a/data_model/in_progress/device_types/DeviceEnergyManagement.xml b/data_model/1.4/device_types/DeviceEnergyManagement.xml
similarity index 100%
rename from data_model/in_progress/device_types/DeviceEnergyManagement.xml
rename to data_model/1.4/device_types/DeviceEnergyManagement.xml
diff --git a/data_model/in_progress/device_types/DimmableLight.xml b/data_model/1.4/device_types/DimmableLight.xml
similarity index 100%
rename from data_model/in_progress/device_types/DimmableLight.xml
rename to data_model/1.4/device_types/DimmableLight.xml
diff --git a/data_model/in_progress/device_types/DimmablePlug-InUnit.xml b/data_model/1.4/device_types/DimmablePlug-InUnit.xml
similarity index 100%
rename from data_model/in_progress/device_types/DimmablePlug-InUnit.xml
rename to data_model/1.4/device_types/DimmablePlug-InUnit.xml
diff --git a/data_model/in_progress/device_types/DimmerSwitch.xml b/data_model/1.4/device_types/DimmerSwitch.xml
similarity index 100%
rename from data_model/in_progress/device_types/DimmerSwitch.xml
rename to data_model/1.4/device_types/DimmerSwitch.xml
diff --git a/data_model/in_progress/device_types/Dishwasher.xml b/data_model/1.4/device_types/Dishwasher.xml
similarity index 100%
rename from data_model/in_progress/device_types/Dishwasher.xml
rename to data_model/1.4/device_types/Dishwasher.xml
diff --git a/data_model/in_progress/device_types/DoorLock.xml b/data_model/1.4/device_types/DoorLock.xml
similarity index 98%
rename from data_model/in_progress/device_types/DoorLock.xml
rename to data_model/1.4/device_types/DoorLock.xml
index e2eb1e9152085d..622b9a8bfc6300 100644
--- a/data_model/in_progress/device_types/DoorLock.xml
+++ b/data_model/1.4/device_types/DoorLock.xml
@@ -85,6 +85,7 @@ Davis, CA 95616, USA
                 <feature name="RID"/>
                 <feature name="FPG"/>
                 <feature name="FACE"/>
+                <feature name="ALIRO"/>
               </orTerm>
             </andTerm>
           </mandatoryConform>
diff --git a/data_model/in_progress/device_types/DoorLockController.xml b/data_model/1.4/device_types/DoorLockController.xml
similarity index 100%
rename from data_model/in_progress/device_types/DoorLockController.xml
rename to data_model/1.4/device_types/DoorLockController.xml
diff --git a/data_model/in_progress/device_types/EVSE.xml b/data_model/1.4/device_types/EVSE.xml
similarity index 100%
rename from data_model/in_progress/device_types/EVSE.xml
rename to data_model/1.4/device_types/EVSE.xml
diff --git a/data_model/in_progress/device_types/ElectricalSensor.xml b/data_model/1.4/device_types/ElectricalSensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/ElectricalSensor.xml
rename to data_model/1.4/device_types/ElectricalSensor.xml
diff --git a/data_model/in_progress/device_types/EnergyTariff.xml b/data_model/1.4/device_types/EnergyTariff.xml
similarity index 100%
rename from data_model/in_progress/device_types/EnergyTariff.xml
rename to data_model/1.4/device_types/EnergyTariff.xml
diff --git a/data_model/in_progress/device_types/EnergyTariffCalendar.xml b/data_model/1.4/device_types/EnergyTariffCalendar.xml
similarity index 100%
rename from data_model/in_progress/device_types/EnergyTariffCalendar.xml
rename to data_model/1.4/device_types/EnergyTariffCalendar.xml
diff --git a/data_model/in_progress/device_types/ExtendedColorLight.xml b/data_model/1.4/device_types/ExtendedColorLight.xml
similarity index 100%
rename from data_model/in_progress/device_types/ExtendedColorLight.xml
rename to data_model/1.4/device_types/ExtendedColorLight.xml
diff --git a/data_model/in_progress/device_types/ExtractorHood.xml b/data_model/1.4/device_types/ExtractorHood.xml
similarity index 100%
rename from data_model/in_progress/device_types/ExtractorHood.xml
rename to data_model/1.4/device_types/ExtractorHood.xml
diff --git a/data_model/in_progress/device_types/Fan.xml b/data_model/1.4/device_types/Fan.xml
similarity index 100%
rename from data_model/in_progress/device_types/Fan.xml
rename to data_model/1.4/device_types/Fan.xml
diff --git a/data_model/in_progress/device_types/FlowSensor.xml b/data_model/1.4/device_types/FlowSensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/FlowSensor.xml
rename to data_model/1.4/device_types/FlowSensor.xml
diff --git a/data_model/in_progress/device_types/GenericSwitch.xml b/data_model/1.4/device_types/GenericSwitch.xml
similarity index 100%
rename from data_model/in_progress/device_types/GenericSwitch.xml
rename to data_model/1.4/device_types/GenericSwitch.xml
diff --git a/data_model/in_progress/device_types/HeatPump.xml b/data_model/1.4/device_types/HeatPump.xml
similarity index 100%
rename from data_model/in_progress/device_types/HeatPump.xml
rename to data_model/1.4/device_types/HeatPump.xml
diff --git a/data_model/in_progress/device_types/HumidifierDehumidifier.xml b/data_model/1.4/device_types/HumidifierDehumidifier.xml
similarity index 100%
rename from data_model/in_progress/device_types/HumidifierDehumidifier.xml
rename to data_model/1.4/device_types/HumidifierDehumidifier.xml
diff --git a/data_model/in_progress/device_types/HumiditySensor.xml b/data_model/1.4/device_types/HumiditySensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/HumiditySensor.xml
rename to data_model/1.4/device_types/HumiditySensor.xml
diff --git a/data_model/in_progress/device_types/JointFabricAdmin.xml b/data_model/1.4/device_types/JointFabricAdmin.xml
similarity index 100%
rename from data_model/in_progress/device_types/JointFabricAdmin.xml
rename to data_model/1.4/device_types/JointFabricAdmin.xml
diff --git a/data_model/in_progress/device_types/LaundryDryer.xml b/data_model/1.4/device_types/LaundryDryer.xml
similarity index 100%
rename from data_model/in_progress/device_types/LaundryDryer.xml
rename to data_model/1.4/device_types/LaundryDryer.xml
diff --git a/data_model/in_progress/device_types/LaundryWasher.xml b/data_model/1.4/device_types/LaundryWasher.xml
similarity index 100%
rename from data_model/in_progress/device_types/LaundryWasher.xml
rename to data_model/1.4/device_types/LaundryWasher.xml
diff --git a/data_model/in_progress/device_types/LightSensor.xml b/data_model/1.4/device_types/LightSensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/LightSensor.xml
rename to data_model/1.4/device_types/LightSensor.xml
diff --git a/data_model/in_progress/device_types/MicrowaveOven.xml b/data_model/1.4/device_types/MicrowaveOven.xml
similarity index 100%
rename from data_model/in_progress/device_types/MicrowaveOven.xml
rename to data_model/1.4/device_types/MicrowaveOven.xml
diff --git a/data_model/in_progress/device_types/ModeSelectDeviceType.xml b/data_model/1.4/device_types/ModeSelectDeviceType.xml
similarity index 100%
rename from data_model/in_progress/device_types/ModeSelectDeviceType.xml
rename to data_model/1.4/device_types/ModeSelectDeviceType.xml
diff --git a/data_model/in_progress/device_types/MountedDimmableLoadControl.xml b/data_model/1.4/device_types/MountedDimmableLoadControl.xml
similarity index 100%
rename from data_model/in_progress/device_types/MountedDimmableLoadControl.xml
rename to data_model/1.4/device_types/MountedDimmableLoadControl.xml
diff --git a/data_model/in_progress/device_types/MountedOnOffControl.xml b/data_model/1.4/device_types/MountedOnOffControl.xml
similarity index 100%
rename from data_model/in_progress/device_types/MountedOnOffControl.xml
rename to data_model/1.4/device_types/MountedOnOffControl.xml
diff --git a/data_model/in_progress/device_types/NetworkInfraIntro.xml b/data_model/1.4/device_types/NetworkInfraIntro.xml
similarity index 100%
rename from data_model/in_progress/device_types/NetworkInfraIntro.xml
rename to data_model/1.4/device_types/NetworkInfraIntro.xml
diff --git a/data_model/in_progress/device_types/NetworkInfraManager.xml b/data_model/1.4/device_types/NetworkInfraManager.xml
similarity index 97%
rename from data_model/in_progress/device_types/NetworkInfraManager.xml
rename to data_model/1.4/device_types/NetworkInfraManager.xml
index 58cbae2e7ab440..a4d17e11c0faaa 100644
--- a/data_model/in_progress/device_types/NetworkInfraManager.xml
+++ b/data_model/1.4/device_types/NetworkInfraManager.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0090" name="Network Infrastructure Manager" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial revision"/>
+    <revision revision="1" summary="Initial release"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/in_progress/device_types/OccupancySensor.xml b/data_model/1.4/device_types/OccupancySensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/OccupancySensor.xml
rename to data_model/1.4/device_types/OccupancySensor.xml
diff --git a/data_model/in_progress/device_types/OnOffLight.xml b/data_model/1.4/device_types/OnOffLight.xml
similarity index 100%
rename from data_model/in_progress/device_types/OnOffLight.xml
rename to data_model/1.4/device_types/OnOffLight.xml
diff --git a/data_model/in_progress/device_types/OnOffLightSwitch.xml b/data_model/1.4/device_types/OnOffLightSwitch.xml
similarity index 100%
rename from data_model/in_progress/device_types/OnOffLightSwitch.xml
rename to data_model/1.4/device_types/OnOffLightSwitch.xml
diff --git a/data_model/in_progress/device_types/OnOffPlug-inUnit.xml b/data_model/1.4/device_types/OnOffPlug-inUnit.xml
similarity index 100%
rename from data_model/in_progress/device_types/OnOffPlug-inUnit.xml
rename to data_model/1.4/device_types/OnOffPlug-inUnit.xml
diff --git a/data_model/in_progress/device_types/OnOffSensor.xml b/data_model/1.4/device_types/OnOffSensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/OnOffSensor.xml
rename to data_model/1.4/device_types/OnOffSensor.xml
diff --git a/data_model/in_progress/device_types/OtaProvider.xml b/data_model/1.4/device_types/OtaProvider.xml
similarity index 100%
rename from data_model/in_progress/device_types/OtaProvider.xml
rename to data_model/1.4/device_types/OtaProvider.xml
diff --git a/data_model/in_progress/device_types/OtaRequestor.xml b/data_model/1.4/device_types/OtaRequestor.xml
similarity index 100%
rename from data_model/in_progress/device_types/OtaRequestor.xml
rename to data_model/1.4/device_types/OtaRequestor.xml
diff --git a/data_model/in_progress/device_types/Oven.xml b/data_model/1.4/device_types/Oven.xml
similarity index 100%
rename from data_model/in_progress/device_types/Oven.xml
rename to data_model/1.4/device_types/Oven.xml
diff --git a/data_model/in_progress/device_types/PowerSource.xml b/data_model/1.4/device_types/PowerSource.xml
similarity index 100%
rename from data_model/in_progress/device_types/PowerSource.xml
rename to data_model/1.4/device_types/PowerSource.xml
diff --git a/data_model/in_progress/device_types/PressureSensor.xml b/data_model/1.4/device_types/PressureSensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/PressureSensor.xml
rename to data_model/1.4/device_types/PressureSensor.xml
diff --git a/data_model/in_progress/device_types/Pump.xml b/data_model/1.4/device_types/Pump.xml
similarity index 100%
rename from data_model/in_progress/device_types/Pump.xml
rename to data_model/1.4/device_types/Pump.xml
diff --git a/data_model/in_progress/device_types/PumpController.xml b/data_model/1.4/device_types/PumpController.xml
similarity index 100%
rename from data_model/in_progress/device_types/PumpController.xml
rename to data_model/1.4/device_types/PumpController.xml
diff --git a/data_model/in_progress/device_types/RainSensor.xml b/data_model/1.4/device_types/RainSensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/RainSensor.xml
rename to data_model/1.4/device_types/RainSensor.xml
diff --git a/data_model/in_progress/device_types/Refrigerator.xml b/data_model/1.4/device_types/Refrigerator.xml
similarity index 100%
rename from data_model/in_progress/device_types/Refrigerator.xml
rename to data_model/1.4/device_types/Refrigerator.xml
diff --git a/data_model/in_progress/device_types/RoboticVacuumCleaner.xml b/data_model/1.4/device_types/RoboticVacuumCleaner.xml
similarity index 93%
rename from data_model/in_progress/device_types/RoboticVacuumCleaner.xml
rename to data_model/1.4/device_types/RoboticVacuumCleaner.xml
index fd30668cd2e084..446410dfb7c60a 100644
--- a/data_model/in_progress/device_types/RoboticVacuumCleaner.xml
+++ b/data_model/1.4/device_types/RoboticVacuumCleaner.xml
@@ -55,10 +55,11 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0074" name="Robotic Vacuum Cleaner" revision="2">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0074" name="Robotic Vacuum Cleaner" revision="3">
   <revisionHistory>
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add cluster usage constraints and informative data. Remove the element requirements section, after moving all constraints to the respective cluster specifications."/>
+    <revision revision="3" summary="Add support for the Service Area cluster"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
@@ -75,5 +76,8 @@ Davis, CA 95616, USA
     <cluster id="0x0061" name="RVC Operational State" side="server">
       <mandatoryConform/>
     </cluster>
+    <cluster id="0x0150" name="Service Area" side="server">
+      <optionalConform/>
+    </cluster>
   </clusters>
 </deviceType>
\ No newline at end of file
diff --git a/data_model/in_progress/device_types/RoomAirConditioner.xml b/data_model/1.4/device_types/RoomAirConditioner.xml
similarity index 100%
rename from data_model/in_progress/device_types/RoomAirConditioner.xml
rename to data_model/1.4/device_types/RoomAirConditioner.xml
diff --git a/data_model/in_progress/device_types/RootNodeDeviceType.xml b/data_model/1.4/device_types/RootNodeDeviceType.xml
similarity index 94%
rename from data_model/in_progress/device_types/RootNodeDeviceType.xml
rename to data_model/1.4/device_types/RootNodeDeviceType.xml
index c96759503bfb13..13473e44cacb60 100644
--- a/data_model/in_progress/device_types/RootNodeDeviceType.xml
+++ b/data_model/1.4/device_types/RootNodeDeviceType.xml
@@ -55,16 +55,24 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0016" name="Root Node" revision="2">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0016" name="Root Node" revision="3">
   <revisionHistory>
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
+    <revision revision="3" summary="Added restriction on Managed Device feature of Access Control cluster"/>
   </revisionHistory>
   <classification class="node" scope="node"/>
   <clusters>
     <cluster id="0x001F" name="Access Control" side="server">
       <quality singleton="true"/>
       <mandatoryConform/>
+      <features>
+        <feature code="" name="MNGD">
+          <optionalConform>
+            <attribute name="ManagedAclAllowed"/>
+          </optionalConform>
+        </feature>
+      </features>
     </cluster>
     <cluster id="0x0028" name="Basic Information" side="server">
       <quality singleton="true"/>
diff --git a/data_model/in_progress/device_types/SecondaryNetworkInterface.xml b/data_model/1.4/device_types/SecondaryNetworkInterface.xml
similarity index 100%
rename from data_model/in_progress/device_types/SecondaryNetworkInterface.xml
rename to data_model/1.4/device_types/SecondaryNetworkInterface.xml
diff --git a/data_model/in_progress/device_types/SmokeCOAlarm.xml b/data_model/1.4/device_types/SmokeCOAlarm.xml
similarity index 100%
rename from data_model/in_progress/device_types/SmokeCOAlarm.xml
rename to data_model/1.4/device_types/SmokeCOAlarm.xml
diff --git a/data_model/in_progress/device_types/SolarPower.xml b/data_model/1.4/device_types/SolarPower.xml
similarity index 100%
rename from data_model/in_progress/device_types/SolarPower.xml
rename to data_model/1.4/device_types/SolarPower.xml
diff --git a/data_model/in_progress/device_types/Speaker.xml b/data_model/1.4/device_types/Speaker.xml
similarity index 100%
rename from data_model/in_progress/device_types/Speaker.xml
rename to data_model/1.4/device_types/Speaker.xml
diff --git a/data_model/in_progress/device_types/TemperatureControlledCabinet.xml b/data_model/1.4/device_types/TemperatureControlledCabinet.xml
similarity index 100%
rename from data_model/in_progress/device_types/TemperatureControlledCabinet.xml
rename to data_model/1.4/device_types/TemperatureControlledCabinet.xml
diff --git a/data_model/in_progress/device_types/TemperatureSensor.xml b/data_model/1.4/device_types/TemperatureSensor.xml
similarity index 100%
rename from data_model/in_progress/device_types/TemperatureSensor.xml
rename to data_model/1.4/device_types/TemperatureSensor.xml
diff --git a/data_model/in_progress/device_types/Thermostat.xml b/data_model/1.4/device_types/Thermostat.xml
similarity index 100%
rename from data_model/in_progress/device_types/Thermostat.xml
rename to data_model/1.4/device_types/Thermostat.xml
diff --git a/data_model/in_progress/device_types/ThreadBorderRouter.xml b/data_model/1.4/device_types/ThreadBorderRouter.xml
similarity index 100%
rename from data_model/in_progress/device_types/ThreadBorderRouter.xml
rename to data_model/1.4/device_types/ThreadBorderRouter.xml
diff --git a/data_model/in_progress/device_types/VideoRemoteControl.xml b/data_model/1.4/device_types/VideoRemoteControl.xml
similarity index 100%
rename from data_model/in_progress/device_types/VideoRemoteControl.xml
rename to data_model/1.4/device_types/VideoRemoteControl.xml
diff --git a/data_model/in_progress/device_types/WaterFreezeDetector.xml b/data_model/1.4/device_types/WaterFreezeDetector.xml
similarity index 100%
rename from data_model/in_progress/device_types/WaterFreezeDetector.xml
rename to data_model/1.4/device_types/WaterFreezeDetector.xml
diff --git a/data_model/in_progress/device_types/WaterHeater.xml b/data_model/1.4/device_types/WaterHeater.xml
similarity index 93%
rename from data_model/in_progress/device_types/WaterHeater.xml
rename to data_model/1.4/device_types/WaterHeater.xml
index 9d038d89c55563..975e9f2bb4b850 100644
--- a/data_model/in_progress/device_types/WaterHeater.xml
+++ b/data_model/1.4/device_types/WaterHeater.xml
@@ -68,9 +68,6 @@ Davis, CA 95616, USA
     <cluster id="0x0094" name="Water Heater Management" side="server">
       <mandatoryConform/>
     </cluster>
-    <cluster id="0x0096" name="Demand Response and Load Control" side="server">
-      <optionalConform/>
-    </cluster>
     <cluster id="0x009E" name="Water Heater Mode" side="server">
       <mandatoryConform/>
     </cluster>
@@ -80,9 +77,6 @@ Davis, CA 95616, USA
         <feature code="" name="Heating">
           <mandatoryConform/>
         </feature>
-        <feature code="" name="ScheduleConfiguration">
-          <mandatoryConform/>
-        </feature>
       </features>
     </cluster>
   </clusters>
diff --git a/data_model/in_progress/device_types/WaterLeakDetector.xml b/data_model/1.4/device_types/WaterLeakDetector.xml
similarity index 100%
rename from data_model/in_progress/device_types/WaterLeakDetector.xml
rename to data_model/1.4/device_types/WaterLeakDetector.xml
diff --git a/data_model/in_progress/device_types/WaterValve.xml b/data_model/1.4/device_types/WaterValve.xml
similarity index 100%
rename from data_model/in_progress/device_types/WaterValve.xml
rename to data_model/1.4/device_types/WaterValve.xml
diff --git a/data_model/in_progress/device_types/WindowCovering.xml b/data_model/1.4/device_types/WindowCovering.xml
similarity index 100%
rename from data_model/in_progress/device_types/WindowCovering.xml
rename to data_model/1.4/device_types/WindowCovering.xml
diff --git a/data_model/in_progress/device_types/WindowCoveringController.xml b/data_model/1.4/device_types/WindowCoveringController.xml
similarity index 100%
rename from data_model/in_progress/device_types/WindowCoveringController.xml
rename to data_model/1.4/device_types/WindowCoveringController.xml
diff --git a/data_model/in_progress/scraper_version b/data_model/1.4/scraper_version
similarity index 100%
rename from data_model/in_progress/scraper_version
rename to data_model/1.4/scraper_version
diff --git a/data_model/1.4/spec_sha b/data_model/1.4/spec_sha
new file mode 100644
index 00000000000000..094141d3c099c6
--- /dev/null
+++ b/data_model/1.4/spec_sha
@@ -0,0 +1 @@
+2760ea4338a4b612ac025bfa5677e6918041c1d4
diff --git a/data_model/in_progress/spec_sha b/data_model/in_progress/spec_sha
deleted file mode 100644
index a399f222280c76..00000000000000
--- a/data_model/in_progress/spec_sha
+++ /dev/null
@@ -1 +0,0 @@
-ec20ddf482db8deffe8b2eb745e34d2f9cea72b2
diff --git a/src/python_testing/TestSpecParsingSupport.py b/src/python_testing/TestSpecParsingSupport.py
index c7f087cb03d834..4e0171b0779936 100644
--- a/src/python_testing/TestSpecParsingSupport.py
+++ b/src/python_testing/TestSpecParsingSupport.py
@@ -259,21 +259,21 @@ def test_build_xml_override(self):
         # checks that the 1.3 spec (default) does not contain in-progress clusters and the TOT does
         tot_xml_clusters, problems = build_xml_clusters(PrebuiltDataModelDirectory.kMaster)
         one_three_clusters, problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_3)
-        in_progress, problems = build_xml_clusters(PrebuiltDataModelDirectory.kInProgress)
+        one_four_clusters, problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_4)
         asserts.assert_greater(len(set(tot_xml_clusters.keys()) - set(one_three_clusters.keys())),
                                0, "Master dir does not contain any clusters not in 1.3")
-        asserts.assert_greater(len(set(tot_xml_clusters.keys()) - set(in_progress.keys())),
-                               0, "Master dir does not contain any clusters not in in_progress")
-        asserts.assert_greater(len(set(in_progress.keys()) - set(one_three_clusters.keys())),
-                               0, "in_progress dir does not contain any clusters not in 1.3")
+        asserts.assert_greater(len(set(tot_xml_clusters.keys()) - set(one_four_clusters.keys())),
+                               0, "Master dir does not contain any clusters not in 1.4")
+        asserts.assert_greater(len(set(one_four_clusters.keys()) - set(one_three_clusters.keys())),
+                               0, "1.4 dir does not contain any clusters not in 1.3")
         # only the pulse width modulation cluster was removed post 1.3
         asserts.assert_equal(set(one_three_clusters.keys()) - set(tot_xml_clusters.keys()),
                              set([Clusters.PulseWidthModulation.id]), "There are some 1.3 clusters that are not included in the TOT spec")
-        asserts.assert_equal(set(in_progress.keys())-set(tot_xml_clusters.keys()),
-                             set(), "There are some in_progress clusters that are not included in the TOT spec")
+        asserts.assert_equal(set(one_four_clusters.keys())-set(tot_xml_clusters.keys()),
+                             set(), "There are some 1.4 clusters that are not included in the TOT spec")
 
         str_path = str(os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                       '..', '..', 'data_model', 'in_progress', 'clusters'))
+                       '..', '..', 'data_model', '1.4', 'clusters'))
         string_override_check, problems = build_xml_clusters(str_path)
         asserts.assert_equal(string_override_check.keys(), self.spec_xml_clusters.keys(), "Mismatched cluster generation")
 
@@ -466,7 +466,7 @@ def test_provisional_clusters(self):
     def test_atomic_thermostat(self):
         tot_xml_clusters, problems = build_xml_clusters(PrebuiltDataModelDirectory.kMaster)
         one_three_clusters, problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_3)
-        in_progress, problems = build_xml_clusters(PrebuiltDataModelDirectory.kInProgress)
+        one_four_clusters, problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_4)
 
         asserts.assert_in("Atomic Request", tot_xml_clusters[Clusters.Thermostat.id].command_map,
                           "Atomic request not found on thermostat command map")
@@ -474,10 +474,10 @@ def test_atomic_thermostat(self):
         asserts.assert_in(request_id, tot_xml_clusters[Clusters.Thermostat.id].accepted_commands.keys(),
                           "Atomic request not found in thermostat accepted command list")
 
-        asserts.assert_in("Atomic Response", tot_xml_clusters[Clusters.Thermostat.id].command_map,
+        asserts.assert_in("Atomic Response", one_four_clusters[Clusters.Thermostat.id].command_map,
                           "Atomic response not found in the thermostat command map")
         response_id = tot_xml_clusters[Clusters.Thermostat.id].command_map["Atomic Response"]
-        asserts.assert_in(response_id, tot_xml_clusters[Clusters.Thermostat.id].generated_commands.keys(),
+        asserts.assert_in(response_id, one_four_clusters[Clusters.Thermostat.id].generated_commands.keys(),
                           "Atomic response not found in thermostat generated command list")
 
         asserts.assert_not_in(
diff --git a/src/python_testing/spec_parsing_support.py b/src/python_testing/spec_parsing_support.py
index 5a66a900c28c91..75ffea120ff126 100644
--- a/src/python_testing/spec_parsing_support.py
+++ b/src/python_testing/spec_parsing_support.py
@@ -509,7 +509,7 @@ def check_clusters_for_unknown_commands(clusters: dict[int, XmlCluster], problem
 
 class PrebuiltDataModelDirectory(Enum):
     k1_3 = auto()
-    kInProgress = auto()
+    k1_4 = auto()
     kMaster = auto()
 
 
@@ -521,15 +521,15 @@ class DataModelLevel(str, Enum):
 def _get_data_model_directory(data_model_directory: typing.Union[PrebuiltDataModelDirectory, str], data_model_level: DataModelLevel) -> str:
     if data_model_directory == PrebuiltDataModelDirectory.k1_3:
         return os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', '1.3', data_model_level)
-    elif data_model_directory == PrebuiltDataModelDirectory.kInProgress:
-        return os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', 'in_progress', data_model_level)
+    elif data_model_directory == PrebuiltDataModelDirectory.k1_4:
+        return os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', '1.4', data_model_level)
     elif data_model_directory == PrebuiltDataModelDirectory.kMaster:
         return os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', 'master', data_model_level)
     else:
         return data_model_directory
 
 
-def build_xml_clusters(data_model_directory: typing.Union[PrebuiltDataModelDirectory, str] = PrebuiltDataModelDirectory.kInProgress) -> tuple[dict[uint, XmlCluster], list[ProblemNotice]]:
+def build_xml_clusters(data_model_directory: typing.Union[PrebuiltDataModelDirectory, str] = PrebuiltDataModelDirectory.k1_4) -> tuple[dict[uint, XmlCluster], list[ProblemNotice]]:
     dir = _get_data_model_directory(data_model_directory, DataModelLevel.kCluster)
 
     clusters: dict[int, XmlCluster] = {}
@@ -776,7 +776,7 @@ def parse_single_device_type(root: ElementTree.Element) -> tuple[list[ProblemNot
     return device_types, problems
 
 
-def build_xml_device_types(data_model_directory: typing.Union[PrebuiltDataModelDirectory, str] = PrebuiltDataModelDirectory.kInProgress) -> tuple[dict[int, XmlDeviceType], list[ProblemNotice]]:
+def build_xml_device_types(data_model_directory: typing.Union[PrebuiltDataModelDirectory, str] = PrebuiltDataModelDirectory.k1_4) -> tuple[dict[int, XmlDeviceType], list[ProblemNotice]]:
     dir = _get_data_model_directory(data_model_directory, DataModelLevel.kDeviceType)
     device_types: dict[int, XmlDeviceType] = {}
     problems = []