Merge pull request #15414 from eileenmcnaughton/fix_log_text