Merge pull request #19291 from eileenmcnaughton/prof