Merged with upstream.