Dev

Merged Daniel Wolf requested to merge dev into translations

Merge request reports