Merge branch 'power-meter' into release