quick fixes for cookies policy
Merge branch 'feature/requested-changes' into staging