Dev to master

Merged Ruben Backx requested to merge development into master

Merge request reports