Cherry-pick release:1.23.0 PRs to rel-1.23.0 (#26003)
This PR cherry-picks the following PRs to the release branch:
- #25988
- #25991
---------
Co-authored-by: Dmitri Smirnov <yuslepukhin@users.noreply.github.com>
Co-authored-by: umangb-09 <umangb@nvidia.com>
