Merge hyperv code from monolith