Fix NRE in ToHttpCookie()
Merge branch 'v3-fixes' into v3