Upstream merge and delete cookie feature