Co-authored-by: Oran Agra <oran@redislabs.com> Co-authored-by: Itamar Haber <itamar@redislabs.com> (cherry picked from commit 8d826393191399e132bd9e56fb51ed83223cc5ca)