ec09a5995d
(cherry picked from commit b48832c0f7)
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>