Merge pull request #11664 from ja-pa/python-packaging-new