Merge branch 'vm'
Minor adjustments about VM layout
Merge branch 'master' into new_design