FIFO-456: Persist ordering in vms list
Merge branch 'test' into dev
dist