Merge develop into master

Merged Jim Hoekstra requested to merge develop into master

Merge request reports