summerFixes merge

Devinrequested to merge
summerFixes into main

Multiple bug fixes for the desktop client, restful server, and companion app.

Merge request reports