Better handle 'update' event in machines list view
Merge branch 'test' into dev