Merge "Fix MeasureEnergyArray impl array size" into sc-dev