Fix the cookie message js
Merge branch 'fix_cookie_message_js'