Upstream merged