(cherry picked from commit 0e20ad14a6a857cb168b808f94721df19b23dc0c)
Co-authored-by: Yossi Gottlieb <yossigo@gmail.com> Co-authored-by: Oran Agra <oran@redislabs.com> (cherry picked from commit b1de173ec0f6a03d6083b87f1505fbf843708685)