Merge pull request #21345 from jefferyto/python-3.11.4