Merge "Add support for ecdsa keys"