Merge pull request #19481 from eileenmcnaughton/pdffix