Mhj/6580 extend redis