New first merge

Fixed several issues from last merge request

Merge request reports

Loading