Issue #3618985: Improved field logic, added test coverage.

Damien McKennarequested to merge
issue/exif-3618985:3618985-better-field-logic into 8.x-2.x

Closes #3618985

Merge request reports