Merge 7 fixed functionality into master

Merge request reports

Loading