Fix for failing test with pdf generation
Pylint fixes - ignore new import dialog
Pylint fixes
Fix merge issues
Fix for failing test with pdf generation
Pylint fixes - ignore new import dialog
Fix lint errors
Resolved merge conflicts