Fixed VM listing.
Merge branch 'test' into dev