Merge "Add virtual dtor for virtual classes"