Merge pull request #26632 from rohitwaghchaure/merging-13-hotfix-to-13-pre-release-13-8

chore: Merging Version 13 hotfix to 13 Pre Release