Merge branch 'use-redis'