Sync with upstream bootstrap