Merge "Fix vtable corruption issue"