Align PDF changes to 140esr

Ensure sanity of our PDF-related patch (722c1f60) after the 140esr rebase.

Edited by ma1