Some additional chnage for handing autopickup of VM's
Merge branch 'test' into dev