Merge pull request #18748 from eileenmcnaughton/log