Included latest changes as unified diff from the branch if no changes from the branch
refactored checking python's version for rjollos/t11565.3