Merge branch 'main' into 748-merge-request-pipeline-modifications-cleanup