Forgot the desktop ones for that last one
Merge branch 'hotfix' into develop