Merge "Update handling of enum/flag fields in GPS data structures."