Merge pull request #23953 from commodo/cython-update1