Merge branch 'main-pc' into ci/run-mr-pipeline-with-fixed-commit