Conf 8

Closed Reiner Jung requested to merge conf-8 into master

Forgot one commit.

Merge request reports