Peters improvements

Merged Holger Niemann requested to merge peter into master

Merge request reports