vsphere deployment
merge fix