Merge "bug fix: pdf generation"