Fixed hypervisor permission check.
Fixed dataset import.
Merge branch 'test' into dev