Merge pull request #16910 from eileenmcnaughton/conf