Formatted EnergyMeter PR, merged Energy Cube comparator support