Merge redis changes