Merge "Move keypair client to lib interfaces"