Merge "Add multiple VM support"