US495: Updated cookie detection behaviour following discussions with Scott, Mike and Marcus
Fixed merge conflict