Merge branch 'battery' into release