Merge "Add BMS as a Battery type"