GDS-1139: Add support for custom field order in JMF