Restore for non existing VM's
Merge branch 'test' into dev