Fixed delete on broken VM's.
Merge branch 'test' into dev