Merge pull request #26892 from rohitwaghchaure/merged-v13-hotfix-into-pre-release

chore: merge version-13-hotfix into version-13-pre-release