Merge branch 'tg/next/1.0__cookie' into tg/next/1.0