Resolve "Fuse together User and Author eln annotations"

Merged Mohammad Nakhaee requested to merge 1057-merge-user-and-author into develop

Merge request reports