[Ovmsdev] Update from master