* Fix Cookie handling
Merge cookie handling fix