BUG: Moved and amended side by side cookie code for ticket 8092