Dev

René Schönerequested to merge
dev into master

Updating master with current development state.

Merge request reports