Merge pull request #18351 from eileenmcnaughton/line