Shared Code Changes

Pulled shared code modifications from desktop app.

Merge request reports

Loading