Merge "MeasuredEnergy comment cleanup" into sc-dev