Merge pull request #23723 from findlayfeng/fix_proto-bonding