debug mode for vm
Merge origin/master
bug