Pulled Shared Code Change from Desktop Application

This code is currently used only on desktop. It is safe to merge.

Merge request reports

Loading