Sync with upstream changes.