Fix/ex mainfiles

Merged Martin Schneider requested to merge fix/ex-mainfiles into master

Merge request reports