ORT 1.23.0 cherry-pick PRs 25629, 25583#25709

jywu-msft merged 2 commits intorel-1.23.0microsoft/onnxruntime:rel-1.23.0from

adrianl/rel-1.23.0/cherrypick_080825_2microsoft/onnxruntime:adrianl/rel-1.23.0/cherrypick_080825_2Copy head branch name to clipboard