Merge "Rewrite GVN's field id and field type handling."