Restore 'vmdk' format
Merge branch 'l_tables' into refactor