Removed redis completely, fixed some bugs.
Merge remote-tracking branch 'remotes/origin/dev' into dev