Merge pull request #10109 from BKPepe/python3