Merge pull request #15866 from ja-pa/redis-6.2.4