Merge branch 'main' into dependabot/pip/numpy-gte-1.17.0-and-lt-3