Merge pull request github#3826 from github/backport-v3.35.2-95e58e9a2

Merge releases/v4 into releases/v3

Merge pull request github#2721 from github/update-v3.28.5-01f001931

Merge main into releases/v3