Master-progress merge

Closed Holger Niemann requested to merge master into Holgers

Merge request reports