Additional metrics for Thermostat
Merge branch 'develop' into web