4 Years Ago
merge from battery_fixes