Merge pull request #12546 from eileenmcnaughton/redis