Merge branch 'ff/redis' into ad/redis