Merge feature-vmware into master as squash merge