Sync with the upstream