eHEA: Fix bonding support