Ability to manually pair
v3.37
v3.38