INFRA-584 Key Management updates