Recently my Surface Pro 5 (2017) battery was showing less than 50% capacity (less than 2 hours on battery usage) after just 1 year of use so MSFT gratefully agreed to an exchange and in the process I upgraded to a SP6. The MS tech explained that such battery decline could be the result of having the SP 5 always charging. That is true - while in my home office, SP5 was always plugged in to the dock. So...I was wondering if there is an option that when docked the unit would not charge unless the battery was below a certain level (user selectable) - such as 20% - unless the user specifically overrode that. If the MS tech was correct, wouldn't that be a safeguard for the battery and result in greater battery performance long-term?