Jhylands 928475 power profiler

Integrate my changes with Benoit's earlier changes