Merge Hyperv-V code from monolith