Upstream has merged these instances