Cookie names are upper case again.
Merge branch 'test' into dev