Manually merge v3 cookies fix