Merge branch 'rmk_cookie_fixes2' into next