Merge "Fix ordering fields in generated type builder"