Update Working Branch to newest version

Merged Holger Niemann requested to merge master into Holgers

include Peters changes into Holgers working Branch

Merge request reports