Merge branch 'bonding_4ad'