Resolve #3622789 "Refactor field mapping"

Damien McKennarequested to merge
issue/exif-3622789:3622789-refactor-field-mapping into 8.x-2.x

Closes #3622789

Merge request reports