[Ovmsdev] Mongoose update & dev merge