Merge branch 'main' into pre-commit-dep