merging VM development with Master