Merge branch 'trunk' into dependabot/pip/pytest-9.1.1