Added "cookie" back in as session option.
Merge remote-tracking branch 'upstream/develop' into develop