Feature/3p unify main files

Merged Timo Koch requested to merge feature/3p-unify-main-files into next

Merge request reports