Master into Holgers to have an up-to-date working branch

Merged Holger Niemann requested to merge master into Holgers

Update Holgers Branch to newest levels

Merge request reports