Hi,
I don’t know when it happened but two of my many Zwave - AEON Micro Smart energy switch G2 wants to measure water consumption. 
This is apparently not correct and watt or kwh would be the sensitive thing for it to measure.
The switch works as expected and all the other sensor values are correct. I wonder if it’s possible to “change back” to “kWh” rather than “cubic meters”?
The other devices does not have this sensor showing up. This started many months ago but I haven’t dived into why before. It might have come with a previous upgrade of Home Assistant Core.