Initial import from upstream.