Merge pull request #3082 from Montellese/generic_python_invoker