Merge "Keep original order of fields in Class." into lmp-mr1-dev