Fix auth
Merge branch 'redis' into develop
Merge branch 'develop'