improve replication compatibility for redis
Merge branch 'develop'