Merge "Cleanup: Add common "create keypair" method"