Merge pull request #20395 from eileenmcnaughton/entry2