Merge "Web Client context menu item display"