Merge branch 'main' into 4-migrate-to-pytest-framework