merged #2822 import_python_driver fix