Merge "Accommodate BATT protocol modifications." into main