Merge pull request #22456 from eileenmcnaughton/legt