Various updates

Merged Kevin Daudt requested to merge modernize into master

Merge request reports