Merge "Fix error in MeasuredEnergySnapshot voltage" into sc-dev