redis refactor
Merge branch '14.1.5'