Merge commit '4b187e804fdfdbc825e17646e82e0218e316a339' * commit '4b187e804fdfdbc825e17646e82e0218e316a339': Some battery improvements:
Merge commit '4b187e804fdfdbc825e17646e82e0218e316a339' * commit '4b187e804fdfdbc825e17646e82e0218e316a339': Some battery improvements: