Repointegration

Closed Markus Scheidgen requested to merge repointegration into master

Just to cherrypick some housekeeping changes.

Merge request reports