INFRA-584 Key Management - Updates