Merge "Fix vtable corruption issue" into nyc-mr1-dev