Merge branch 'main' into ci/trigger-pytest-error-for-exceptions