Merge in tools branch

Oliver Falk requested to merge tools into master

Merge request reports