merge for changes from desktop

merge for changes from desktop.