Merge pull request #20981 from jefferyto/python3-packages-fix-build