Deploying further INFRA-102 changes