update from desktop-branch

Update from desktop-branch