Upstream merge finalized