Changes merged with upstream.