Merge "CustomMeasuredPowerCalculator" into sc-dev