Merge pull request #11138 from protocolbuffers/main-202212021626

Merge release branch 21.x in to main (21.10 release)