Merge branch 'hotfix/wishlist-cookie-gunicorn-unicode-error' into develop