New cookies

Resolves [RAVE-1265](https://issues.apache.org/jira/browse/RAVE-1265) and [1264](https://issues.apache.org/jira/browse/RAVE-1264)