Merge branch 'async-battery' into release