Dev

Jan Hauserrequested to merge
dev into master

Merge request reports