merge new librarian changes with custom pdf fix