Merge "Fix keypair GET response schema"