Issue 1642

Ghost Userrequested to merge
issue_1642 into develop

Merge request reports