Cherry-picked-from: e1096c714772a8a776c209fef45983538b81a3a1 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>