Merge branch 'jt/transport-hide-vtable'