BZ-12208 Improvements PDf