Merge branch 'main' into basop-ci/check-for-regressions-in-mr-pl