Merge/dev to fork master merge

Merge request reports