Merge "static_assert to catch struct mismatches earlier"