update generated code
Update generated code
Merge branch 'master' into package-support
Update vm