Merge branch 'bonding-bug-fixes-and-regressions'