INFRA-584 Key Management update