Merge develop

Merged Daniel Müller requested to merge develop into master

Merge request reports