<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #34899 Cherry pick for #35127 Co-authored-by: Martin Angers <martin.n.angers@gmail.com>
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #34899 Cherry pick for #35127 Co-authored-by: Martin Angers <martin.n.angers@gmail.com>