Use the correct field type when sorting.
Merge branch 'master' into prod