Sync with -current.