Merge branch 'main' into vlad/test-udpated-basop-ci-branch-with-MR-pipeline