updates from master

Closed Bernhard Landauer requested to merge master into rescue

Merge request reports