Re: Upstream merge progress