Load vms after the hypers
Merge branch 'test' into dev