Merge "Fix class/struct mismatch."