General update

Merged Bengfort requested to merge general-update into master

Merge request reports