dev -> master

Christian Eichler requested to merge dev into master

Merge request reports