Merge branch 'bonding-cleanups'