264 Commits (battery-drain-fix)