Fixing the Desktop build.
Merge branch 'release'