bootstrap: sync with upstream.