Merge branch 'fix-vt' into wip