Mhj/6580 extend redis

Same for this one.