Cleanup/efm

Merged Katharina Heck requested to merge cleanup/efm into master

Merge request reports