Merge "Fix ordering of fields with the same name." into lmp-mr1-dev