Merge pull request #7291 from illume/upstream-desktop-platform-0036