Fixing CF9 cookie value issue
Merge branch 'develop'