Dev in master v2

Nico Bugl requested to merge dev into master

Merge request reports