Simplify PDF to remove warning
Merge pull request #526 from qidane/rebased/dev_4_4/simplify-pdf

Simplify PDF to remove warning (rebased onto dev_4_4)