Future merge master

Gerhard Ravenrequested to merge
future-merge-master into future

Sync future with current master

Merge request reports