vmlocal
Merge branch 'vmlocal'