Dev to master

Ruben Backxrequested to merge
development into master

Merge request reports