Merge "Fix weak vtable warnings"