(cherry picked from commit 50d5bb2e)
Co-authored-by: daniel_hucik 34608205+hucik14@users.noreply.github.com