Merge branch 'trunk' into dependabot/pip/sphinx-5.0.2