diff --git a/config/images/leviton/vrcs2.png b/config/images/leviton/vrcs2.png
index c8fb383c13..544554957e 100644
Binary files a/config/images/leviton/vrcs2.png and b/config/images/leviton/vrcs2.png differ
diff --git a/config/images/leviton/vrcs4.png b/config/images/leviton/vrcs4.png
new file mode 100755
index 0000000000..fd0fc19243
Binary files /dev/null and b/config/images/leviton/vrcs4.png differ
diff --git a/config/images/leviton/vrcz4.png b/config/images/leviton/vrcz4.png
new file mode 100755
index 0000000000..115ce552d6
Binary files /dev/null and b/config/images/leviton/vrcz4.png differ
diff --git a/config/images/leviton/vrr15.png b/config/images/leviton/vrr15.png
new file mode 100755
index 0000000000..5211b7d772
Binary files /dev/null and b/config/images/leviton/vrr15.png differ
diff --git a/config/leviton/vrcs2.xml b/config/leviton/vrcs2.xml
index 6c124d6adc..205ce33bb3 100644
--- a/config/leviton/vrcs2.xml
+++ b/config/leviton/vrcs2.xml
@@ -1,21 +1,45 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
-    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0206:0201</MetaDataItem>
+    <MetaDataItem name="Name">VRCS2</MetaDataItem>
+    <MetaDataItem name="Description">2-Button Scene Controller with Switches</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0243:1102</MetaDataItem>
     <MetaDataItem name="ProductPic">images/leviton/vrcs2.png</MetaDataItem>
-    <MetaDataItem id="0206" name="ZWProductPage" type="0201">https://products.z-wavealliance.org/products/288/</MetaDataItem>
-    <MetaDataItem id="0206" name="FrequencyName" type="0201">U.S. / Canada / Mexico</MetaDataItem>
-    <MetaDataItem name="Description">The Vizia RF + 4-Button Zone Controller with Switch (VRCZ4-MR) and 4-Button Scene Controller with Switch (VRCS4-MR) are perfect for retrofit applications because they replace an existing switch giving the user control of the local load as well as the benefit of scene or zone control.
- Item Description
-Vizia RF + 4-Button Zone Controller with Switch for Multi-Location Control with IR Remote Capability. White face assembled on device, ivory and light almond faces included.</MetaDataItem>
-    <MetaDataItem name="ProductPage">http://www.leviton.com/OA_HTML/ProductDetail.jsp?partnumber=VRCZ4-MRZ&amp;section=44147&amp;minisite=10251</MetaDataItem>
-    <MetaDataItem id="0206" name="Identifier" type="0201">VRCZ4-MR</MetaDataItem>
-    <MetaDataItem name="ProductSupport">http://www.leviton.com/OA_HTML/Home.jsp?minisite=10251&amp;respid=22372</MetaDataItem>
-    <MetaDataItem name="Name">VRCZ4-MR</MetaDataItem>
+    <MetaDataItem id="0243" name="ZWProductPage" type="1102">https://products.z-wavealliance.org/products/286/</MetaDataItem>
+    <MetaDataItem id="0243" name="FrequencyName" type="1102">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0243" name="Identifier" type="1102">VRCS2-MRZ</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/286/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="2">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/287/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="3">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/288/xml</Entry>
+      <Entry author="Jeff Brown - jeff.brown@gmail.com" date="29 June 2020" revision="4">Fixed metadata, added groups and indicators</Entry>
     </ChangeLog>
   </MetaData>
-  <CommandClass id="112"/>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <!-- Each button toggles an individual scene on or off.  Multiple scenes can be active at once.
+           By default the device will associate groups 1 and 2 with the local loads.
+           Do not auto associate the controller with group 1. -->
+      <Group index="1" max_associations="232" label="Button 1" auto="false"/>
+      <Group index="2" max_associations="232" label="Button 2"/>
+    </Associations>
+  </CommandClass>
+
+  <!-- Indicator Lights -->
+  <!-- Use these messages to override the indicator lights.
+
+       91 00 1D 0D 01 00 00 : Reset LEDs to locally controlled operation (default behavior).
+       91 00 1D 0D 01 FF xx : Set LEDs by OR-ing together the following bit patterns.
+
+         00000000: button 1 off
+         00000001: button 1 green
+         00010000: button 1 red
+         00010001: button 1 amber
+         00000000: button 2 off
+         00000010: button 2 green
+         00100000: button 2 red
+         00100010: button 2 amber
+  -->
 </Product>
diff --git a/config/leviton/vrcs4.xml b/config/leviton/vrcs4.xml
new file mode 100755
index 0000000000..ab32b23e4a
--- /dev/null
+++ b/config/leviton/vrcs4.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">VRCS4</MetaDataItem>
+    <MetaDataItem name="Description">4-Button Scene Controller with or without Switches</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0261:0702</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/leviton/vrcs4.png</MetaDataItem>
+    <MetaDataItem id="0261" name="ZWProductPage" type="0802">https://products.z-wavealliance.org/products/318/</MetaDataItem>
+    <MetaDataItem id="0261" name="FrequencyName" type="0802">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0261" name="Identifier" type="0802">VRCS4-M0Z</MetaDataItem>
+    <MetaDataItem id="0243" name="ZWProductPage" type="1302">https://products.z-wavealliance.org/products/287/</MetaDataItem>
+    <MetaDataItem id="0243" name="FrequencyName" type="1302">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0243" name="Identifier" type="1302">VRCS4-MRZ</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jeff Brown - jeff.brown@gmail.com" date="29 June 2020" revision="1">Initial creation</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <!-- Each button toggles an individual scene on or off.  Only one scene can be active at once.
+           If the device has a switch, then by default it will associate group 1 with the local load.
+           Do not auto associate the controller with group 1. -->
+      <Group index="1" max_associations="232" label="Button 1" auto="false"/>
+      <Group index="2" max_associations="232" label="Button 2"/>
+      <Group index="3" max_associations="232" label="Button 3"/>
+      <Group index="4" max_associations="232" label="Button 4"/>
+    </Associations>
+  </CommandClass>
+
+  <!-- Indicator Lights -->
+  <!-- Use these messages to override the indicator lights.
+
+       91 00 1D 0D 01 00 00 : Reset LEDs to locally controlled operation (default behavior).
+       91 00 1D 0D 01 FF xx : Set LEDs by OR-ing together the following bit patterns.
+
+         00000000: button 1 off
+         00000001: button 1 green
+         00010000: button 1 red
+         00010001: button 1 amber
+         00000000: button 2 off
+         00000010: button 2 green
+         00100000: button 2 red
+         00100010: button 2 amber
+         00000000: button 3 off
+         00000100: button 3 green
+         01000000: button 3 red
+         01000100: button 3 amber
+         00000000: button 4 off
+         00001000: button 4 green
+         10000000: button 4 red
+         10001000: button 4 amber
+  -->
+
+  <!-- Scene Control -->
+  <!-- Use these messages to assign scenes to the controller's buttons.
+       When no scene is assigned (default behavior), the controller sends BASIC_SET messages
+       to association groups 1 to 4 corresponding to the active button.
+       When a scene is assigned, the controller sends scene activations and level change messages
+       that offer richer control of the device's behavior.
+
+       The controller has 8 scene groups:
+         - Groups 1-4 are triggered when buttons 1-4 are pressed when their LED is not lit.
+         - Groups 5-8 are triggered when buttons 1-4 are pressed when their LED is already lit.
+
+       To configure the scenes, send SCENE_CONTROLLER_CONF_SET to associate scenes with
+       each scene group.  The simplest solution is to assign scene groups 1-8 to scenes 1-8
+       so they are in one-to-one correspondence using the following messages:
+
+         2D 01 01 01 00 : Set scene group 1 to scene 1
+         2D 01 02 02 00 : Set scene group 2 to scene 2
+         2D 01 03 03 00 : Set scene group 3 to scene 3
+         2D 01 04 04 00 : Set scene group 4 to scene 4
+         2D 01 05 05 00 : Set scene group 5 to scene 5
+         2D 01 06 06 00 : Set scene group 6 to scene 6
+         2D 01 07 07 00 : Set scene group 7 to scene 7
+         2D 01 08 08 00 : Set scene group 8 to scene 8
+
+       Once this is done, the controller will send SCENE_ACTIVATION_SET to the devices
+       in association groups 1-4 whenever their corresponding scenes are triggered.  To handle
+       these messages centrally, make sure to associate the primary controller (node 1) with
+       association groups 1-4.  The primary controller will then receive messages like this:
+
+         2B 01 S# 00 : Sent by controller when scene S# is triggered
+
+       When you press the up/down level below the scene buttons, the controller will send
+       send SWITCH_MULTILEVEL_START_LEVEL_CHANGE and SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE messages
+       to the association group corresponding to the most recently activated scene.
+
+         26 04 40 00 : Sent by controller when the down lever is pressed
+         26 05       : Sent by controller when the down lever is released
+         26 04 00 00 : Sent by controller when the up lever is pressed
+         26 05       : Sent by controller when the up lever is released
+
+       After a scene change, the controller sometimes sends SCENE_ACTUATOR_CONF_GET messages
+       (2C 02 00) to query the scene configuration of the controlled devices.  The controlled
+       devices should reply with SCENE_ACTUATOR_CONF_REPORT (2C 03 <sceneId> FF 00) to confirm
+       the scene change.  Ignoring the message works too although the controller seems to ask
+       several times after each scene change until it gets the expected reply.
+
+       Scene messages interact with the indicator light change messages described above.
+       Turning on and off button LEDs determines whether the controller considers the
+       corresponding scenes to be active.
+  -->
+  <CommandClass id="38">
+    <State>
+      <AfterMark>true</AfterMark>
+    </State>
+  </CommandClass>
+</Product>
diff --git a/config/leviton/vrcz4.xml b/config/leviton/vrcz4.xml
index ae76ad4e3e..41529899da 100644
--- a/config/leviton/vrcz4.xml
+++ b/config/leviton/vrcz4.xml
@@ -1,18 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-Leviton 4 Button Zone Controller VRCZ4 / VRCZ4-MR
-https://products.z-wavealliance.org/products/288
-https://products.z-wavealliance.org/products/374
--->
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
-	<!-- Association Groups -->
-	<CommandClass id="133">
-		<Associations num_groups="4">
-		       <!-- Do not auto associate with Group 1 on this device -->
-		       <Group index="1" max_associations="232" label="Basic - Button 1" auto="false"/>
-		       <Group index="2" max_associations="232" label="Basic - Button 2"/>
-		       <Group index="3" max_associations="232" label="Basic - Button 3"/>
-		       <Group index="4" max_associations="232" label="Basic - Button 4"/>
-		</Associations>
-	</CommandClass>
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">VRCZ4</MetaDataItem>
+    <MetaDataItem name="Description">4-Button Zone Controller with or without Switches</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0261:0702</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/leviton/vrcz4.png</MetaDataItem>
+    <MetaDataItem id="0261" name="ZWProductPage" type="0702">https://products.z-wavealliance.org/products/374/</MetaDataItem>
+    <MetaDataItem id="0261" name="FrequencyName" type="0702">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0261" name="Identifier" type="0702">VRCZ4-M0Z</MetaDataItem>
+    <MetaDataItem id="0243" name="ZWProductPage" type="1202">https://products.z-wavealliance.org/products/288/</MetaDataItem>
+    <MetaDataItem id="0243" name="FrequencyName" type="1202">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0243" name="Identifier" type="1202">VRCZ4-MRZ</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jeff Brown - jeff.brown@gmail.com" date="29 June 2020" revision="2">Fixed metadata and groups, added indicators</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <!-- Each button toggles an individual zone on or off.  Multiple zones can be active at once.
+           If the device has a switch, then by default it will associate group 1 with the local load.
+           Do not auto associate the controller with group 1. -->
+      <Group index="1" max_associations="232" label="Button 1" auto="false"/>
+      <Group index="2" max_associations="232" label="Button 2"/>
+      <Group index="3" max_associations="232" label="Button 3"/>
+      <Group index="4" max_associations="232" label="Button 4"/>
+    </Associations>
+  </CommandClass>
+
+  <!-- Indicator Lights -->
+  <!-- Use these messages to override the indicator lights.
+
+       91 00 1D 0D 01 00 00 : Reset LEDs to locally controlled operation (default behavior).
+       91 00 1D 0D 01 FF xx : Set LEDs by OR-ing together the following bit patterns.
+
+         00000000: button 1 off
+         00000001: button 1 green
+         00010000: button 1 red
+         00010001: button 1 amber
+         00000000: button 2 off
+         00000010: button 2 green
+         00100000: button 2 red
+         00100010: button 2 amber
+         00000000: button 3 off
+         00000100: button 3 green
+         01000000: button 3 red
+         01000100: button 3 amber
+         00000000: button 4 off
+         00001000: button 4 green
+         10000000: button 4 red
+         10001000: button 4 amber
+  -->
+
+  <!-- Scene Control -->
+  <!-- Use these messages to assign scenes to the controller's buttons.
+       When no scene is assigned (default behavior), the controller sends BASIC_SET messages
+       to association groups 1 to 4 corresponding to the active button.
+       When a scene is assigned, the controller sends scene activations and level change messages
+       that offer richer control of the device's behavior.
+
+       The controller has 8 scene groups:
+         - Groups 1-4 are triggered when buttons 1-4 are toggled to the left side.
+         - Groups 5-8 are triggered when buttons 1-4 are toggled to the right side.
+
+       To configure the scenes, send SCENE_CONTROLLER_CONF_SET to associate scenes with
+       each scene group.  The simplest solution is to assign scene groups 1-8 to scenes 1-8
+       so they are in one-to-one correspondence using the following messages:
+
+         2D 01 01 01 00 : Set scene group 1 to scene 1
+         2D 01 02 02 00 : Set scene group 2 to scene 2
+         2D 01 03 03 00 : Set scene group 3 to scene 3
+         2D 01 04 04 00 : Set scene group 4 to scene 4
+         2D 01 05 05 00 : Set scene group 5 to scene 5
+         2D 01 06 06 00 : Set scene group 6 to scene 6
+         2D 01 07 07 00 : Set scene group 7 to scene 7
+         2D 01 08 08 00 : Set scene group 8 to scene 8
+
+       Once this is done, the controller will send SCENE_ACTIVATION_SET to the devices
+       in association groups 1-4 whenever their corresponding scenes are triggered.  To handle
+       these messages centrally, make sure to associate the primary controller (node 1) with
+       association groups 1-4.  The primary controller will then receive messages like this:
+
+         2B 01 S# 00 : Sent by controller when scene S# is triggered
+
+       When you press the up/down level below the scene buttons, the controller will send
+       send SWITCH_MULTILEVEL_START_LEVEL_CHANGE and SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE messages
+       to the association group corresponding to the most recently activated scene.
+
+         26 04 40 00 : Sent by controller when the down lever is pressed
+         26 05       : Sent by controller when the down lever is released
+         26 04 00 00 : Sent by controller when the up lever is pressed
+         26 05       : Sent by controller when the up lever is released
+
+       After a scene change, the controller sometimes sends SCENE_ACTUATOR_CONF_GET messages
+       (2C 02 00) to query the scene configuration of the controlled devices.  The controlled
+       devices should reply with SCENE_ACTUATOR_CONF_REPORT (2C 03 <sceneId> FF 00) to confirm
+       the scene change.  Ignoring the message works too although the controller seems to ask
+       several times after each scene change until it gets the expected reply.
+
+       Scene messages interact with the indicator light change messages described above.
+       Turning on and off button LEDs determines whether the controller considers the
+       corresponding scenes to be active.
+  -->
+  <CommandClass id="38">
+    <State>
+      <AfterMark>true</AfterMark>
+    </State>
+  </CommandClass>
 </Product>
diff --git a/config/leviton/vrr15.xml b/config/leviton/vrr15.xml
new file mode 100755
index 0000000000..b843f63269
--- /dev/null
+++ b/config/leviton/vrr15.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">VRR15</MetaDataItem>
+    <MetaDataItem name="Description">Scene Capable Receptable</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0334:1603</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/leviton/vrr15.png</MetaDataItem>
+    <MetaDataItem id="0334" name="ZWProductPage" type="1603">https://products.z-wavealliance.org/products/812/</MetaDataItem>
+    <MetaDataItem id="0334" name="FrequencyName" type="1603">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0334" name="Identifier" type="1603">VRR15-1LZ</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jeff Brown - jeff.brown@gmail.com" date="29 June 2020" revision="1">Initial creation</Entry>
+    </ChangeLog>
+  </MetaData>
+</Product>
diff --git a/config/manufacturer_specific.xml b/config/manufacturer_specific.xml
index 3c44ac336d..e953d171cf 100644
--- a/config/manufacturer_specific.xml
+++ b/config/manufacturer_specific.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ManufacturerSpecificData Revision="101" xmlns="https://github.com/OpenZWave/open-zwave">
+<ManufacturerSpecificData Revision="102" xmlns="https://github.com/OpenZWave/open-zwave">
   <Manufacturer id="0028" name="2B Electronics"></Manufacturer>
   <Manufacturer id="0098" name="2GIG Technologies">
     <Product config="2gig/ct50e.xml" id="015e" name="CT50e Thermostat" type="3200"/>
@@ -1071,26 +1071,30 @@
   <Manufacturer id="0187" name="LEVION Technologies GmbH"></Manufacturer>
   <Manufacturer id="001d" name="Leviton">
     <Product id="0206" name="RZP15-1LW Binary Scene Switch" type="0101"/>
-    <Product config="leviton/vrcs2.xml" id="0206" name="RZP03-1LW Binary Scene Switch" type="0201"/>
-    <Product id="030b" name="VRP03-1LW Lamp Module" type="0202"/>
+    <Product id="0206" name="RZP03-1LW Binary Scene Switch" type="0201"/>
     <Product id="0206" name="RZS15-1LX Binary Scene Switch" type="0301"/>
-    <Product id="0209" name="VRS15-1LZ Binary Scene Switch" type="0301"/>
-    <Product config="leviton/vrs15.xml" id="0334" name="VRS15-1LZ Switch" type="0301"/>
     <Product config="leviton/rzi10.xml" id="0206" name="RZI10-1LX Multilevel Scene Switch" type="0401"/>
-    <Product config="leviton/vri06.xml" id="0209" name="VRI06-1LX Multilevel Scene Switch" type="0401"/>
-    <Product config="leviton/vri10.xml" id="0206" name="VRI10-1LX Multilevel Scene Switch" type="0501"/>
-    <Product config="leviton/vri10.xml" id="0209" name="VRI10-1LZ Scene Capable Dimmer" type="0501"/>
-    <Product config="leviton/vri10.xml" id="0209" name="VRMX1-1LZ Multilevel Scene Switch" type="0602"/>
-    <Product config="leviton/vri10.xml" id="0334" name="VRMX1-1LZ Multilevel Scene Switch" type="0602"/>
+    <Product id="030b" name="VRC0P-1LW Plug-in Serial Interface Module" type="0b02"/>
     <Product id="0215" name="VRC51-1LX One Scene Controller" type="0901"/>
+    <Product config="leviton/vrcpg.xml" id="0206" name="VRCPG-SG Handheld Remote Controller" type="0c01"/>
+    <Product config="leviton/vrcs2.xml" id="0243" name="VRCS2-MRZ 2-Button Scene Controller with Switches" type="1102"/>
+    <Product config="leviton/vrcs4.xml" id="0261" name="VRCS4-M0Z 4-Button Scene Controller" type="0802"/>
+    <Product config="leviton/vrcs4.xml" id="0243" name="VRCS4-MRZ 4-Button Scene Controller with Switch" type="1302"/>
     <Product config="leviton/vrcz4.xml" id="0261" name="VRCZ4-M0Z 4-Button Zone Controller" type="0702"/>
-    <Product id="030b" name="VRC0P-1LW Plug-in Serial Interface Module" type="0b02"/>
-    <Product config="leviton/vrcpg.xml" id="0206" name="VRCPG-SG RF Handheld Remote Controller" type="0c01"/>
-    <Product config="leviton/vre06.xml" id="0334" name="VRE06-1LZ Multilevel Scene Switch" type="0e01"/>
-    <Product config="leviton/vrf01.xml" id="0209" name="VRF01-1LZ Scene Capable Quiet Fan Speed Control" type="1001"/>
-    <Product config="leviton/vrf01.xml" id="0334" name="VRF01-1LZ Quiet Fan Speed Control" type="1001"/>
-    <Product id="0243" name="VRCS2-MRZ 2-Button Scene Controller with Switches" type="1102"/>
     <Product config="leviton/vrcz4.xml" id="0243" name="VRCZ4-MRZ 4-Button Zone Controller with Switch" type="1202"/>
+    <Product config="leviton/vre06.xml" id="0334" name="VRE06-1LZ 600W Electronic Low Voltage Scene Capable Dimmer" type="0e01"/>
+    <Product config="leviton/vrf01.xml" id="0209" name="VRF01-1LZ 1.5A Scene Capable Quiet Fan Speed Control" type="1001"/>
+    <Product config="leviton/vrf01.xml" id="0334" name="VRF01-1LZ 1.5A Scene Capable Quiet Fan Speed Control" type="1001"/>
+    <Product config="leviton/vri06.xml" id="0209" name="VRI06-1LZ 600W Incandescent Scene Capable Dimmer" type="0401"/>
+    <Product config="leviton/vri06.xml" id="0334" name="VRI06-1LZ 600W Incandescent Scene Capable Dimmer" type="0401"/>
+    <Product config="leviton/vri10.xml" id="0206" name="VRI10-1LX 1000W Incandescent Scene Capable Dimmer" type="0501"/>
+    <Product config="leviton/vri10.xml" id="0209" name="VRI10-1LZ 1000W Incandescent Scene Capable Dimmer" type="0501"/>
+    <Product config="leviton/vri10.xml" id="0209" name="VRMX1-1LZ 1000W Magnetic Low Voltage Scene Capable Dimmer" type="0602"/>
+    <Product config="leviton/vri10.xml" id="0334" name="VRMX1-1LZ 1000W Magnetic Low Voltage Scene Capable Dimmer" type="0602"/>
+    <Product id="030b" name="VRP03-1LW 300W Scene Capable Plug-In Dimming Lamp Module" type="0202"/>
+    <Product config="leviton/vrr15.xml" id="0334" name="VRR15-1LZ Scene Capable Receptacle" type="1603"/>
+    <Product config="leviton/vrs15.xml" id="0209" name="VRS15-1LZ 15A Scene Capable Switch" type="0301"/>
+    <Product config="leviton/vrs15.xml" id="0334" name="VRS15-1LZ 15A Scene Capable Switch" type="0301"/>
     <Product id="0334" name="DZPD3-1LW Plug-In Dimming Lamp Module" type="1902"/>
     <Product id="0334" name="DZPA1-1LW Plug-In Appliance Module" type="1a02"/>
     <Product id="0334" name="DZMX1-1LZ Dimmer" type="1b03"/>
diff --git a/cpp/build/testconfigversions.cfg b/cpp/build/testconfigversions.cfg
index 90d94d170e..397918f3e2 100644
--- a/cpp/build/testconfigversions.cfg
+++ b/cpp/build/testconfigversions.cfg
@@ -1656,12 +1656,16 @@
                                                'md5' => '2e49f23a2cb4569ac6c8d82cd0d1c1fdd9384c94a9929b4479ed8f2db6fd8c956e96a7d36bf0a32da77957afca5b319b55d5129e973345195b610b21f18a3249'
                                              },
                'config/leviton/vrcs2.xml' => {
-                                               'Revision' => 3,
-                                               'md5' => '6163822e432a74e1bbf1114ca11e810e550c4d90ce454b7b3a924af3db6621d047def018dd3f48ff11a91bdaf0e9586c8de34485c884ba6c7f19db7ea64c5752'
+                                               'Revision' => 4,
+                                               'md5' => 'a3cd3a0134a4d1b9268b4cc3904817b9cc35124469521d6fc8b37ae23e6f28c49fe51d80d2f4754980f8199d2ddb848c0fefa747b92508b80093a8848259b457'
                                              },
-               'config/leviton/vrcz4.xml' => {
+               'config/leviton/vrcs4.xml' => {
                                                'Revision' => 1,
-                                               'md5' => '496680a38f17174dfd6926dc45208c47f76433505227eb1952aef4d52af714a0b3401ab43a5bd9d57acaee399c4db2209229ef78bb8b5884c9cd15e009c8d8b2'
+                                               'md5' => '1eff47c68d5ebe17e4002fb809b3251849021041d0282c8ab7541813e2e1d3b09575d2dbd152a76bd05013bc70e2b33215fb54caf191d0c0265f5fee031905b6'
+                                             },
+               'config/leviton/vrcz4.xml' => {
+                                               'Revision' => 2,
+                                               'md5' => 'efc07d298959c68282ecc25a4502c275e79b2abf0ce76d26ff91dd4e9b18536f093277ebc036ae1c00db5cbfb6c5ada49baf869c9a86a19c606726005d10c4a7'
                                              },
                'config/leviton/vre06.xml' => {
                                                'Revision' => 2,
@@ -1679,6 +1683,10 @@
                                                'Revision' => 3,
                                                'md5' => '9fa98d67f20fb67b25548993f0d004319d0c2978465226c1ff359a2dbf6a75919484eeaf45ba1a78c7b8ac72191538e5e3ea36e4f8cfa392eb0e2b8bf8a0e0d5'
                                              },
+               'config/leviton/vrr15.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => '3e46a0d2eca5bec85114b6c8b7f83eb3a52a7e80b9ce0790ce0b4bc7f2abfcefb76c841aee8ac58cae7e382525daff85079169ba71c89517d851e3e61d66fe13'
+                                             },
                'config/leviton/vrs15.xml' => {
                                                'Revision' => 1,
                                                'md5' => 'd89c5ecc71d6fabce275e8cda97edc9d42ba989269c1d4046ea530280ce5ca5d941956538b1f224030a6f34fb007b25d680c2c7570d6c088dd0e763e04f379f1'
@@ -1748,8 +1756,8 @@
                                                    'md5' => '4d34aeaaea917c229bedbb737e4de1550b2d7db5f9e61566a1c0a39966b6442d381d01f93714e12aae1404797d36854274cc4063dd7424b00d27da238b17a36a'
                                                  },
                'config/manufacturer_specific.xml' => {
-                                                       'Revision' => 101,
-                                                       'md5' => '22e92ae48baa076b4a9eec9af1b9e9c5a7851a94866b71ccaa63e82a1cdc1e990fa5cc3ccd2550b92ef1114263b93efdf08beb34db0d82813b84d09280d97e62'
+                                                       'Revision' => 102,
+                                                       'md5' => 'bdb22441f12fdeea9d658d4418d718f527852ac65c5cd3761d3094a5101455710f7189ca74a4dc9a53c32737d6a85f283981b326aec867a33fc799db4e49bf73'
                                                      },
                'config/mcohome/a8-9.xml' => {
                                               'Revision' => 1,