New merge

Merged Daniela Genius requested to merge new_merge into master

Merge request reports