Merge branch 'main' into 42-add-sba-pytest-run-to-mr-pipeline