Merge branch 'main' into shared/ci-make-merge-request-pipeline-interruptible