Merge branch 'power' into release