Merge pull request #20459 from eileenmcnaughton/trigg