Merge "Store fields for gnu_hash separately"