User and Author (#975)

Merged Mohammad Nakhaee requested to merge UserAuthor_975 into develop

Merge request reports