Merge "Fix struct vs. class mismatches"