Sync with eb377e.