PR #28930 was originally only merged into master. Later is was
backported to the patch branch as 34395ae, but some changes were missed.
This commit backports the missing bits to get the contributors and
related infrastructure in sync with master. This makes it easier to
backport future changes.
PR Close#29584