Merge pull request #3346 from github/backport-v3.31.7-cf1bb45a2

Merge pull request #3346 from github/backport-v3.31.7-cf1bb45a2 #8567