WIP: Feature/integration rebase2

Closed Timo Koch requested to merge feature/integration-rebase2 into master

Merge request reports