Fix foreign key field typo.
Merge branch 'add-ordering-on-fields' into develop