Merge branch 'powercap'