Today
merge from battery_chargeleft_fix