base

Initial support of 2.1 pairing.

Note: Some cases have not been tested yet, as we would need to
get proper UI support.