Better handling of VM's prior to registration.
Merge branch 'test' into dev