Merge branch 'main' into scripts-updates-to-basop-ci-branch