(cherry picked from commit 35a569478f)
35a569478f
Co-authored-by: Andre Vallestero <39736205+AndreVallestero@users.noreply.github.com>