Merge change 7900

* changes:
  Initial support of 2.1 pairing.