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