Fix auth
Merge branch 'redis' into develop