Redo redis client protection code.
Merge branch 'development'