merged my vmware-detect devel branch with main