More changes in the VM reimport.
Merge branch 'test' into dev