In fact, could you submit the changes to the battery module as a separate patch? They seem independent of VBrain.