diff --git a/config/homeseer/hs-wd100plus.xml b/config/homeseer/hs-wd100plus.xml
index 084063ad..04cd6e14 100644
--- a/config/homeseer/hs-wd100plus.xml
+++ b/config/homeseer/hs-wd100plus.xml
@@ -1,4 +1,4 @@
-<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/000C:3034:4447</MetaDataItem>
     <MetaDataItem name="ProductPic">images/homeseer/hs-wd100plus.png</MetaDataItem>
@@ -29,6 +29,7 @@ the device.   To manually reset, tap the ON button twice quickly and then tap th
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1730/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1731/xml</Entry>
+      <Entry author="Jean-Francois Auger- Nechry@gmail.com" date="25 May 2019" revision="5">Apply PR #1546 from kaburke</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters -->
@@ -38,61 +39,17 @@ the device.   To manually reset, tap the ON button twice quickly and then tap th
       <Item label="No" value="0"/>
       <Item label="Yes" value="1"/>
     </Value>
-    <Value genre="config" index="7" label="Remote level percent" max="99" min="1" type="byte" units="%" value="99">
+    <Value genre="config" index="7" label="Remote level percent" max="99" min="1" type="short" units="%" value="99">
       <Help>Indicates how much each level dims/brightens as a portion of the whole range when set remotely.</Help>
     </Value>
-    <Value genre="config" index="8" label="Remote duration per level" max="22" min="1" size="2" type="list" units="ms" value="22">
+    <Value genre="config" index="8" label="Remote duration per level" max="255" min="1" size="2" type="short" units="cs" value="22">
       <Help>Indicates the time duration of each level when set remotely.</Help>
-      <Item label="10" value="1"/>
-      <Item label="20" value="2"/>
-      <Item label="30" value="3"/>
-      <Item label="40" value="4"/>
-      <Item label="50" value="5"/>
-      <Item label="60" value="6"/>
-      <Item label="70" value="7"/>
-      <Item label="80" value="8"/>
-      <Item label="90" value="9"/>
-      <Item label="100" value="10"/>
-      <Item label="110" value="11"/>
-      <Item label="120" value="12"/>
-      <Item label="130" value="13"/>
-      <Item label="140" value="14"/>
-      <Item label="150" value="15"/>
-      <Item label="160" value="16"/>
-      <Item label="170" value="17"/>
-      <Item label="180" value="18"/>
-      <Item label="190" value="19"/>
-      <Item label="200" value="20"/>
-      <Item label="210" value="21"/>
-      <Item label="220" value="22"/>
     </Value>
-    <Value genre="config" index="9" label="Local level percent" max="99" min="1" type="byte" units="%" value="99">
+    <Value genre="config" index="9" label="Local level percent" max="99" min="1" type="short" units="%" value="99">
       <Help>Indicates how much each level dims/brightens as a portion of the whole range when set locally.</Help>
     </Value>
-    <Value genre="config" index="10" label="Local duration per level" max="22" min="1" size="2" type="list" units="ms" value="22">
+    <Value genre="config" index="10" label="Local duration per level" max="22" min="1" size="2" type="short" units="cs" value="22">
       <Help>Indicates the time duration of each level when set locally.</Help>
-      <Item label="10" value="1"/>
-      <Item label="20" value="2"/>
-      <Item label="30" value="3"/>
-      <Item label="40" value="4"/>
-      <Item label="50" value="5"/>
-      <Item label="60" value="6"/>
-      <Item label="70" value="7"/>
-      <Item label="80" value="8"/>
-      <Item label="90" value="9"/>
-      <Item label="100" value="10"/>
-      <Item label="110" value="11"/>
-      <Item label="120" value="12"/>
-      <Item label="130" value="13"/>
-      <Item label="140" value="14"/>
-      <Item label="150" value="15"/>
-      <Item label="160" value="16"/>
-      <Item label="170" value="17"/>
-      <Item label="180" value="18"/>
-      <Item label="190" value="19"/>
-      <Item label="200" value="20"/>
-      <Item label="210" value="21"/>
-      <Item label="220" value="22"/>
     </Value>
   </CommandClass>
   <!-- Association Groups -->
diff --git a/cpp/build/testconfigversions.cfg b/cpp/build/testconfigversions.cfg
index 6b94e19c..00e1a8dc 100644
--- a/cpp/build/testconfigversions.cfg
+++ b/cpp/build/testconfigversions.cfg
@@ -1292,8 +1292,8 @@
                                                        'md5' => '94dabe266274dd83fc72b16f6275d80b7fd35e6193fa9cebf483c491b1db37f40650bf1cd2c05bf3bc5bd0723de1df691c2968b6068a663d869e5824dee58438'
                                                      },
                'config/homeseer/hs-wd100plus.xml' => {
-                                                       'Revision' => 4,
-                                                       'md5' => '2ced20b47b7e67e9a15134531c9c38c58591d361c0a4c141f1658a3e89b0d8fbb5899efd7668feb180db1cec48f7ab3224b06fd03556fc4a65a8c22c315e35d7'
+                                                       'Revision' => 5,
+                                                       'md5' => 'a6b1e0b74df5f7591aa1deb580e87b6b5607bb9a84057cfee69b2135da431b11e794d813cf5118c1ee489c650098f9047c5d1b8af3ce9a22baf59cfd3691844a'
                                                      },
                'config/homeseer/hs-wd200plus.xml' => {
                                                        'Revision' => '1',