Version 2 1 0

Merged Ruben Backx requested to merge version-2-1-0 into development

Merge request reports