BZ-12208 PDf improvements