Merge "Add support for specifying which key types are supported"