Merge branch 'ab/pre-auto-gc-battery'