JOJ-111 - Cookie Policy
Merge remote-tracking branch 'origin/master'