Merge pull request #5190 from TDT-AG/pr/20210715-proto-bonding