[OS-8504] General revision

Merged Ghost User requested to merge os8504 into master

Merge request reports