Cors again
Merge branch 'master' into feature/support_redis_failover