Merge pull request #26868 from rohitwaghchaure/merge-version-13-hotfix-into-v13-pre-9

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