[Bug 813814] New: KMS