Merge pull request #5031 from eileenmcnaughton/infra-fix