wip
Merge remote-tracking branch 'origin/lock' into lockvm