Merge branch 'power-resource' into release