Update changes also in to Holgers Working Branch

Merged Holger Niemann requested to merge master into Holgers

Merge request reports