Sync with Windows Github client