Merge "Fix vtable corruption."