fixing merge conflict for backport Co-authored-by: sarah-spang <86264026+sarah-spang@users.noreply.github.com>