INFRA-584 - Minor update