Cleanup of Cookie Filter
Fixed the build
Merge branch 'devel'