Merge "[VMware] inital commit"