Co-authored-by: Yarden Shoham <git@yardenshoham.com> (cherry picked from commit ad0a34b492c3d41952ff4648c8bfb7b54c376151)